procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct typos in and omissions from earlier Android port changes

Browse source 
* java/AndroidManifest.xml.in: Remove duplicate permissions.

* java/org/gnu/emacs/EmacsWindowManager.java
(removeWindowConsumer): Disregard isFinishing for non-initial
activities.
This commit is contained in:
Po Lu 2024-04-06 11:17:49 +08:00
parent 0286a11f31
commit 617bd85cd0
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/AndroidManifest.xml.in
View file

@ -31,7 +31,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
android:versionName="@version@">
<!-- Paste in every permission in existence so Emacs can do
anything. -->
everything. -->
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
@ -95,8 +95,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
<uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
<uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.RECEIVE_MMS" />
<uses-permission android:name="android.permission.RECEIVE_WAP_PUSH" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="android.permission.SMS_FINANCIAL_TRANSACTIONS" />
@ -185,7 +183,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.WRITE_PROFILE" />
<uses-permission android:name="android.permission.WRITE_SMS" />
<uses-permission android:name="android.permission.WRITE_SOCIAL_STREAM" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />

13
java/org/gnu/emacs/EmacsWindowManager.java
View file

@ -221,11 +221,14 @@ && isWindowEligible (consumer, window))
{
consumer.detachWindow ();
/* Though pruneWindows will likely remove the same windows, call
onActivityDetached anyway if isFinishing is set, as in
obscure circumstances pruneWindows will not remove frames
bound to the system-started task. */
if (isFinishing)
/* Though pruneWindows will likely remove the same window(s),
call onActivityDetached anyway if isFinishing is set, if
CONSUMER not be a multitasking activity, as in obscure
circumstances pruneWindows will not remove frames bound to
the system-started task. */
if (isFinishing
&& (!(consumer instanceof EmacsMultitaskActivity)
|| Build.VERSION.SDK_INT < Build.VERSION_CODES.Q))
window.onActivityDetached ();
}