OSDN Git Service
Bryan Ferris [Tue, 25 Jun 2019 18:36:14 +0000 (18:36 +0000)]
Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into nyc-mr2-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3 am:
36fdca0a65
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Bryan Ferris [Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)]
Merge changes from topic "am-
641f3aa3-ebd9-46aa-8f39-
1f4ec4f86eb3" into nyc-mr2-dev
* changes:
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8 am:
8c3a23e6b1
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab
Protect VPN dialogs against overlay.
Android Build Merger (Role) [Wed, 5 Jun 2019 17:32:01 +0000 (17:32 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21 am:
86c9bdd251 am:
6d72c0681f am:
d944d907df
Change-Id: Ia92e1831963623df7931de17b029a92bab7f9374
Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:57 +0000 (17:31 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21 am:
86c9bdd251 am:
6d72c0681f
Change-Id: I38fbeaf20d21dd174e2b022196446631c20b2367
Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:54 +0000 (17:31 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21 am:
86c9bdd251
Change-Id: I16e96c2b33f18459189bfff359ae85483667a202
Android Build Merger (Role) [Wed, 5 Jun 2019 17:31:48 +0000 (17:31 +0000)]
[automerger] Clear the Parcel before writing an exception during a transaction am:
f8ef5bcf21
Change-Id: I416ed302e6c680fd006bd9b38565ebfc8b132084
Michael Wachenschwanz [Thu, 16 May 2019 05:58:15 +0000 (22:58 -0700)]
Clear the Parcel before writing an exception during a transaction
This prevents any object data from being accidentally overwritten by the
exception, which could cause unexpected malformed objects to be sent
across the transaction.
Test: atest CtsOsTestCases:ParcelTest#testExceptionOverwritesObject
Bug:
34175893
Change-Id: Iaf80a0ad711762992b8ae60f76d861c97a403013
Merged-In: Iaf80a0ad711762992b8ae60f76d861c97a403013
Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:13 +0000 (00:30 +0000)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3 am:
36fdca0a65
Change-Id: I201858b931655939fd26bc3ba7052bbfebe6703e
Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:10 +0000 (00:30 +0000)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60 am:
0984de50e3
Change-Id: I91d36de4c10c81554827995e1adce8f3d8c1d612
Android Build Merger (Role) [Wed, 5 Jun 2019 00:30:05 +0000 (00:30 +0000)]
[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:
216f65bf60
Change-Id: I4679e1c6f44119e4f6504141d2614e4266ed7b36
Bryan Ferris [Tue, 21 May 2019 19:38:19 +0000 (12:38 -0700)]
[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
Previously startActivity would assume that the system was the calling user when
startActivityInPackage was called. Now the uid of the calling application is
forwarded by the system.
Test: manual; we added logging statements to check the value of realCallingUid
in startActivitiesMayWait when launching the calendar app from the calendar widget
and verified that it was the calendar uid rather than the system uid.
Bug:
123013720
Change-Id: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Merged-In: I0ef42c2f89b537a720f1ad5aefac756b0ccac52e
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:33 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8 am:
8c3a23e6b1
Change-Id: Ifcd6f27ff206d4c81a2b2a1ee07d5e95b1a2a8e4
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:30 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2 am:
caf19dfbb8
Change-Id: I7f8a6762ceb6382f8c7f760a3d77a48b61f968a3
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:27 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab am:
e2100ac8f2
Change-Id: If900759c5c2c097a1f731859c49d3ed3b6608296
Android Build Merger (Role) [Mon, 3 Jun 2019 18:09:24 +0000 (18:09 +0000)]
[automerger] Protect VPN dialogs against overlay. am:
016c72c8ab
Change-Id: I09148d777617ccb4852931250f1b70314c41da48
Chalard Jean [Mon, 20 May 2019 04:11:37 +0000 (13:11 +0900)]
Protect VPN dialogs against overlay.
Bug:
130568701
Test: manual. After this, can't display on top of it
Change-Id: Ib032f800edb0416cc15f01a34954340d0d0ffa78
Merged-In: Ib032f800edb0416cc15f01a34954340d0d0ffa78
(cherry picked from commit
4e80dc2861614d25a1f957f50040a8cf04812d11)
Android Build Merger (Role) [Tue, 7 May 2019 19:41:27 +0000 (19:41 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c am:
d6f4a3f2bc
Change-Id: I56ea274e6a04f25a4556a675fc5896cb27271499
Android Build Merger (Role) [Tue, 7 May 2019 19:40:52 +0000 (19:40 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518 am:
498d367b2c
Change-Id: I2f2c6d9634df88a1f7a8eae1b3a76dea8b6a1479
Android Build Merger (Role) [Tue, 7 May 2019 19:40:17 +0000 (19:40 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c am:
4938d3e518
Change-Id: I6a2f5b46c70720cedf377f107b77d590b297aea4
Android Build Merger (Role) [Tue, 7 May 2019 19:39:38 +0000 (19:39 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:
fe9f143d2c
Change-Id: I29e8b905ef0450d9bd7a7fcd82411cffa84394d4
Jonathan Scott [Tue, 7 May 2019 15:27:17 +0000 (16:27 +0100)]
[RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.
Bug:
127605586
Test: Manual
Change-Id: I5b5b0f9184220a4ed3080ca27792f66d1f5d41aa
TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into nyc-mr2-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c am:
75b579135c
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into nyc-mr1-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into nyc-dr1-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)]
Merge "Permission Check For DPM.getPermittedAccessibilityServices" into nyc-dev
TreeHugger Robot [Wed, 10 Apr 2019 23:26:00 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into cw-f-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Permission Check For DPM.getPermittedAccessibilityServices
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into nyc-mr2-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into nyc-mr1-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into nyc-dr1-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge "[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into nyc-dev
TreeHugger Robot [Wed, 10 Apr 2019 22:20:55 +0000 (22:20 +0000)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into cw-f-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
Android Build Merger (Role) [Wed, 10 Apr 2019 12:44:01 +0000 (12:44 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88
Change-Id: I9f56349020376c4cb459597bf01cb4956344f7a8
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:56 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e
Change-Id: If32bb0948a2b9aa67b99ceae0ed9234f570198bf
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:51 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697
Change-Id: I064e17eb9e4a91cbf8cda5fe6ee37da48724634d
Android Build Merger (Role) [Wed, 10 Apr 2019 12:43:44 +0000 (12:43 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b
Change-Id: Ia35b381b55199cc0c3b516ccc5091993a2c3d488
Pavel Grafov [Wed, 10 Apr 2019 11:47:25 +0000 (12:47 +0100)]
Limit IsSeparateProfileChallengeAllowed to system callers
Fixes:
128599668
Test: build, set up separate challenge
Merged-In: I2fef9ab13614627c0f1bcca04759d0974fc6181a
Change-Id: I2fef9ab13614627c0f1bcca04759d0974fc6181a
Android Build Merger (Role) [Tue, 9 Apr 2019 22:29:04 +0000 (22:29 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8
Change-Id: If90b329955ca2514e6c236932614648670d440ea
Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:44 +0000 (22:28 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e
Change-Id: Ic6d7bf16ab67d441e77f003288129671c2ec327d
Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:40 +0000 (22:28 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0
Change-Id: I362a9976890358467b16f07315295b17d767b9b1
Android Build Merger (Role) [Tue, 9 Apr 2019 22:28:33 +0000 (22:28 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0
Change-Id: Ic1d3439eb787c393d0f595d04c7627345118474d
Julia Reynolds [Wed, 27 Mar 2019 16:15:57 +0000 (12:15 -0400)]
[RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage
Test: atest
Fixes:
128599467
Change-Id: I13a0ca7590f8c4b44379730e0ee2088aba400c2a
(cherry picked from commit
657d164136199126ae241848887de0230699cea0)
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:42 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b am:
49a505f4f9
Change-Id: I0af65577fac55fce95549a27dc3ecf00b94d20ff
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:37 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b
Change-Id: I172642a771dcafa2d106886984cba3de7a87ae03
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:32 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568
Change-Id: Ib3786714238c868448bc448408a854907052ae2d
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:26 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965
Change-Id: I6d0a4a82a74b78b156b877e0d0785de16cac3856
Bryan Ferris [Thu, 4 Apr 2019 22:18:52 +0000 (15:18 -0700)]
[RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser.
Added a check for the MANAGE_USERS permission to
PackageManagerService#isPackageDeviceAdminOnAnyUser.
Test: Modify the settings app to log the call attempt and follow the
steps below
In order to work around the limitations of N builds we needed to modify
the settings app to log the call attempt. This is described in detail at
b/
128599183#comment15
Bug:
128599183
Change-Id: Ie96c8e174983f61574f12d5d4b210d06377054e5
Android Build Merger (Role) [Tue, 26 Mar 2019 10:13:41 +0000 (10:13 +0000)]
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c am:
75b579135c
Change-Id: I62d3f4b0d7f00b2f15003fa176d4758599dc2353
Android Build Merger (Role) [Tue, 26 Mar 2019 10:13:35 +0000 (10:13 +0000)]
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c
Change-Id: Ia4146b009e593ddda10c5878432533b3192c27d6
Android Build Merger (Role) [Tue, 26 Mar 2019 10:13:29 +0000 (10:13 +0000)]
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be
Change-Id: Ie52de123dc9e0587d16992f72e0794de69207b81
Android Build Merger (Role) [Tue, 26 Mar 2019 10:13:22 +0000 (10:13 +0000)]
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf
Change-Id: I45ff5ff42ee294967ae7e03329338abd49c94df4
Eran Messeri [Mon, 25 Mar 2019 14:31:04 +0000 (14:31 +0000)]
Permission Check For DPM.getPermittedAccessibilityServices
Bug:
128599660
Test: com.android.server.devicepolicy.DevicePolicyManagerTest
Test: com.google.android.gts.devicepolicy.DeviceOwnerTest
Change-Id: I8be915bd6a4ff99884d23005a4c6f0100806dbe8
Merged-In: I8ee3f876fcaffa63636645f0f59709cd147254ef
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:39 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5 am:
26fda93676
Change-Id: I87431bd661f6d5243d4c442e3caf6db247dc89bd
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:31 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5
Change-Id: I5c7df1fd86ece1f84fba51250568a0d049b591f9
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:22 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d
Change-Id: I0499fab6407457adb226a0fef751e22c9566179f
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:11 +0000 (21:01 +0000)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8
Change-Id: I6a05a6ca8ad3313c901a2ad692851d2096b21e7b
WyattRiley [Tue, 19 Feb 2019 21:19:13 +0000 (13:19 -0800)]
DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot
Safe order of pointer setting and background thread start
Verifying mCallEndElapsedRealtimeMillis is not the initial value
Bug:
112159033
Bug:
115361555
Bug:
125124724
Test: Verified not-after-boot with test code b/
115361555#comment14
Test: Reproed NPE on Nexus 5x with test thread sleep and verify fix
Change-Id: I596f913bc79873274c2743132c93ef2381d9f3c7
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:53 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522 am:
276e18c147
Change-Id: I2a8463e8e885a81229b28e7e99e7432a08a04c93
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:43 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522
Change-Id: I9e0504f59437cc8fd72e96630a6fb753a4cbb423
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:29 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba
Change-Id: I51fbf27831b8b981a7b1a6e2af9cf46d8e544c12
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:16 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8
Change-Id: I8da1dd728ff244a1363d9274aa3f41d1c6081ee8
Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]
Select only preinstalled Spell Checker Services
When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.
Fixes:
64764051
Bug:
118694079
Test: Manually as follows:
1. Open 'packages/inputmethods/LatinIME/java/AndroidManifest.xml'
and remove 'AndroidSpellCheckerService'
2. lunch aosp_buillhead-userdebug && make -j
3. Flash the image
4. adb shell dumpsys textservices
-> no spell checker is recognized
5. adb shell settings get secure selected_spell_checker
-> null
6. tapas SampleSpellCheckerService
7. make -j
8. adb install -r $OUT/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
9. adb shell dumpsys textservices
-> SampleSpellCheckerService is recognized
10. adb shell settings get secure selected_spell_checker
-> null
Change-Id: I16f12293d15258c9148677c7ee09fe6dcf81e81d
Merged-In: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:47 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7 am:
1684713f2e
Change-Id: Ib4cbddb955c57d2d59fb3b7fe656e21bc56266aa
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:41 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7
Change-Id: I019b36991306a8f7887b7a0b8233b2c9f1c9ed32
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:36 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10
Change-Id: Idfe048ca52ab0eb317e9313f56b884d264c14fd5
Android Build Merger (Role) [Thu, 10 Jan 2019 00:44:29 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1
Change-Id: I11efc66592aada0a9b54299b6d782e92e247f811
Bryan Ferris [Wed, 9 Jan 2019 23:22:20 +0000 (15:22 -0800)]
Revert "Select only preinstalled Spell Checker Services"
This reverts commit
fa265ed97026e3b8675a2ccbf4035cad6dc1523f.
Reason for revert: The backport for b/
118694079 was applied improperly.
The fix involved filtering the class members list of spell checkers into a new list before searching it. The backport filtered the list but failed to update references to the class member into references to the local variable, creating no change in observable behavior. A new version of this commit will be simultaneously uploaded, which both fixes the bad behavior and allows us to have exactly 1 CL per branch that fixes the issue.
Bug:
118694079
Change-Id: Ic38a2ca2ddede7f0929779b0f2292b7823c11e87
Merged-In: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9
Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:59 +0000 (14:07 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557 am:
b2b98a008b
Change-Id: I29c3f97af12987c8a1dd8a69529641d32d2dd172
Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:52 +0000 (14:07 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557
Change-Id: Ibc588da08fbb6069989c7c97110e4cecea0b0ce5
Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:43 +0000 (14:07 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676
Change-Id: I828e0c99ab41935d20033c970b5131f2fcbf9085
Android Build Merger (Role) [Thu, 3 Jan 2019 14:07:33 +0000 (14:07 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306
Change-Id: I423ddd8df74bee8dbf7cd96009bbdffebf81b93a
Tony Mak [Thu, 29 Nov 2018 17:37:42 +0000 (17:37 +0000)]
RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
Also don't show smart actions for selections in text with unsupported
characters.
Bug:
116321860
Test: runtest -x cts/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
Change-Id: Id271cab8aef6b9b13ef17f1a8654c7616f75cf13
Android Build Merger (Role) [Fri, 21 Dec 2018 16:49:09 +0000 (16:49 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0
Change-Id: I896fbc8000b44041f54f7e314eb1b970c4644389
Android Build Merger (Role) [Fri, 21 Dec 2018 16:49:03 +0000 (16:49 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664
Change-Id: Ifd8d821683c3c61e2a0e10ac4ce0c24e74e06282
Android Build Merger (Role) [Fri, 21 Dec 2018 16:48:57 +0000 (16:48 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0
Change-Id: I2bb3f878634f4ab80f400fccbd4d1fe6610e5a82
Android Build Merger (Role) [Fri, 21 Dec 2018 16:48:50 +0000 (16:48 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b
Change-Id: I944dc076c63ba9fd5101bc0366a342e057a13d47
WyattRiley [Thu, 6 Dec 2018 19:43:58 +0000 (11:43 -0800)]
Adding SUPL NI Emergency Extension Time
Configurable by carrier config.xml resource
Bug:
118839234
Bug:
115361555
Bug:
112159033
Test: On device, see b/
115361555#comment14
Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Merged-In: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:32 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63 am:
8df481923f am:
6e652225ad
Change-Id: Iece38d8723b40e22f86f4aa599d42dbf9a2fcbab
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:25 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63 am:
8df481923f
Change-Id: If661d9f3206b0e9da2a98ffb14b0ff38154cd757
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:20 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63
Change-Id: I9541ff6206955ed3479d5b4aa6c78f23304d3165
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:12 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970
Change-Id: I6a0825a14c8b0f38415cccacc315ba84eb88f5b9
Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]
Select only preinstalled Spell Checker Services
When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.
Fixes:
64764051
Bug:
118694079
Test: Manually as follows:
0. Make sure AOSP keyboard is pre-installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
-> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb reboot
8. adb shell settings get --user 0 secure selected_spell_checker
-> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]
Merge changes from topic "am-
9fd37bbd-f227-4135-a674-
78c7ef1f0468" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f77737395b
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]
Merge changes from topic "am-
6c55709f-f895-4072-8c00-
5133d079d8d8" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
0697e9e6d7
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]
Merge changes from topic "am-
8da5d3f1-21c0-4b80-9cbb-
748987f515da" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
faba866b30
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]
Merge changes from topic "am-
a4f2313d-91d9-4723-8d15-
dc7e5aa52970" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
cfd1e141b9
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]
Merge changes from topic "am-
707d9054-0085-4add-8cb5-
07f6cb10d135" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
65cfd97b69
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]
Merge changes from topic "am-
e8cf3957-7e41-48c5-b339-
2114401da749" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c82e0b36ed
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]
Merge changes from topic "am-
6f74b9fb-4f7a-4949-a2b2-
4de2e4256447" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
eadf247a57
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:09 +0000 (19:47 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c82e0b36ed
Change-Id: I58f6aae098f5dcb6c8ecfcaef6427f5276d36324
Bill Yi [Sat, 10 Nov 2018 19:46:51 +0000 (11:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9be4c84c6a0abd2cecfc8ac49b1d9b8a8fe38079
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:44 +0000 (19:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5739e3bfb2
Change-Id: I17330d6b3d4cf62d89a3413605ceae1b701bb858
Bill Yi [Sat, 10 Nov 2018 19:40:18 +0000 (11:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib25ad353f0684aebfd2817cabd5abea5a63d970f
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:11 +0000 (18:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cfd1e141b9
Change-Id: Id0e2056ac5c7ef52d8d2f844bb3ff5c660e27959