OSDN Git Service
Eran Messeri [Thu, 11 Apr 2019 02:03:10 +0000 (19:03 -0700)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev am:
07a485743a
am:
30826bd658
Change-Id: I117d15dc0168ebd0f09835957e4b1757a1ae5a7c
Julia Reynolds [Thu, 11 Apr 2019 00:44:09 +0000 (17:44 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev am:
2256fd4e11
am:
51fee974a9
Change-Id: I5c0f89e5614901b57880fff5b59a2f6766893903
Julia Reynolds [Thu, 11 Apr 2019 00:39:03 +0000 (17:39 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev am:
652a666500
am:
5d35ad7446
Change-Id: I0e8dff954426479e5a58f0a8f0dad10a294f7b25
Eran Messeri [Thu, 11 Apr 2019 00:35:21 +0000 (17:35 -0700)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev
am:
07a485743a
Change-Id: I0ba4a71037e5bac19a540320665446b55b7aafb6
Pavel Grafov [Thu, 11 Apr 2019 00:29:31 +0000 (17:29 -0700)]
[automerger skipped] [automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6 am:
20007cb46f
am:
3ae9c5c63b -s ours
am skip reason: change_id I2fef9ab13614627c0f1bcca04759d0974fc6181a with SHA1
1b6301cf24 is in history
Change-Id: I1065183419a6868c2f9d21ddae9b455056fbf963
Julia Reynolds [Thu, 11 Apr 2019 00:19:16 +0000 (17:19 -0700)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-dev
am:
2256fd4e11
Change-Id: I1658f2dc59428265adf385ec2e9c579abbefb023
Julia Reynolds [Wed, 10 Apr 2019 23:56:01 +0000 (16:56 -0700)]
Merge changes from topic "am-
3ca7326a-cbf1-4f97-a1b5-
a4fdfac0fb47" into oc-dev
am:
652a666500
Change-Id: I4e93c29d4d65d14d39b683a27004f871b1dd0b9a
Pavel Grafov [Wed, 10 Apr 2019 23:41:27 +0000 (16:41 -0700)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6
am:
20007cb46f
Change-Id: I3bf88bf3a830dc7dea61e32d1df31b273a5d1afe
TreeHugger Robot [Wed, 10 Apr 2019 23:26:00 +0000 (23:26 +0000)]
Merge changes from topic "am-
09249f80-e618-46fc-ac06-
c7fdc73c36ae" into oc-dev
* changes:
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c am:
75b579135c am:
0f19d41748
[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 22:59:44 +0000 (22:59 +0000)]
Merge "[RESTRICT_AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage" into oc-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 oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8 skipped:
9f3fca716a
[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
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) [Wed, 10 Apr 2019 12:44:06 +0000 (12:44 +0000)]
[automerger] Limit IsSeparateProfileChallengeAllowed to system callers am:
9061fcc46b am:
39f5432697 am:
9c0bc5405e am:
55209aca88 am:
d5ce9a41b6
Change-Id: I9f9adc6f9979b3ee946e43150556f0ba971a67f8
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
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
Change-Id: I2fef9ab13614627c0f1bcca04759d0974fc6181a
Android Build Merger (Role) [Tue, 9 Apr 2019 22:29:07 +0000 (22:29 +0000)]
[automerger] [RESTRICT AUTOMERGE]: Add cross user permission check - areNotificationsEnabledForPackage am:
a2b2e377a0 am:
00121902b0 am:
777c45416e am:
0bf87880d8 skipped:
9f3fca716a
Change-Id: I0dd61347ddd16574c9bb4f301725da09d88e737d
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)
Bryan Ferris [Tue, 9 Apr 2019 20:56:40 +0000 (13:56 -0700)]
Merge changes from topic "am-
e391c592-eeb3-4cc9-85fd-
fa5d3bf694c5" into oc-dev am:
2833e406e0
am:
ed9361ce1c
Change-Id: I8c538a46f02f4d46ddc5d78ee19612649c15a46c
Varun Shah [Tue, 9 Apr 2019 20:46:55 +0000 (13:46 -0700)]
Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
18e7dedf6c
am:
5e3ef6a1ea
Change-Id: I60be094774400df44d79a0291858a0783557831b
Bryan Ferris [Tue, 9 Apr 2019 20:20:18 +0000 (13:20 -0700)]
Merge changes from topic "am-
e391c592-eeb3-4cc9-85fd-
fa5d3bf694c5" into oc-dev
am:
2833e406e0
Change-Id: Iad49fea0efffc9766797f590b9140cb4bb73a3fd
Bryan Ferris [Tue, 9 Apr 2019 19:46:49 +0000 (19:46 +0000)]
Merge changes from topic "am-
e391c592-eeb3-4cc9-85fd-
fa5d3bf694c5" into oc-dev
* changes:
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b am:
49a505f4f9 skipped:
022bfaa808
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b am:
49a505f4f9
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965
[RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser.
Varun Shah [Tue, 9 Apr 2019 19:12:19 +0000 (12:12 -0700)]
Added missing permission check to isPackageDeviceAdminOnAnyUser.
am:
18e7dedf6c
Change-Id: I3cd02487a2f39775e86c22ed12fb0fae45198ba4
Android Build Merger (Role) [Thu, 4 Apr 2019 22:24:47 +0000 (22:24 +0000)]
[automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am:
7b5a576965 am:
0494ac6568 am:
70b534799b am:
49a505f4f9 skipped:
022bfaa808
Change-Id: I3bf41e099ceca0d122df82cf2f8a18d3ec8b3808
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
Varun Shah [Wed, 20 Mar 2019 18:10:33 +0000 (11:10 -0700)]
Added missing permission check to isPackageDeviceAdminOnAnyUser.
Added a check for the MANAGE_USERS permission to
PackageManagerService#isPackageDeviceAdminOnAnyUser.
To test that the method is still usable:
1) Enable virtual storage via: adb shell sm set-virtual-disk true
2) Follow instructions by clicking on notification to set up virtual storage
3) Go to Settings -> Apps & notifications -> See all X apps
4) Click on any non-system app (example Instagram)
5) Tap Storage and you should see a "Change" button (if not, choose another app)
6) Tap Change and you should see Internal and Virtual storage options listed
7) The above step confirms the method is still usable by Settings
Bug:
128599183
Test: SafetyNet logging (steps listed above)
Change-Id: I989f1daf52a71f6c778ebd81baa6f1bf83e9a718
Merged-In: I36521fa43daab399e08869647326a7ac32d1e512
Android Build Merger (Role) [Tue, 26 Mar 2019 10:13:46 +0000 (10:13 +0000)]
[automerger] Permission Check For DPM.getPermittedAccessibilityServices am:
4fd13eefcf am:
39eef269be am:
5d66886b4c am:
75b579135c am:
0f19d41748
Change-Id: Idee49f5f8c935dda02d3a19c8b5680bed6d7de81
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
Wyatt Riley [Mon, 4 Mar 2019 15:11:25 +0000 (07:11 -0800)]
Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am:
809231680f
am:
21c4a58435
Change-Id: I3d4e666268ac37f41c6d94e10f5e5e1f2928ef7f
WyattRiley [Mon, 4 Mar 2019 15:02:56 +0000 (07:02 -0800)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5 am:
26fda93676 skipped:
cf76183e6c am:
cf81345649
am:
94029593c4
Change-Id: I816c914fd79f9589efa0e6b587649cd6264113bc
Wyatt Riley [Mon, 4 Mar 2019 14:56:23 +0000 (06:56 -0800)]
Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev
am:
809231680f
Change-Id: If2f27dd775d4d5d543d23d10dcce10bc1bc4f51a
WyattRiley [Mon, 4 Mar 2019 14:51:02 +0000 (06:51 -0800)]
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am:
b5e7bbe5b8 am:
1bb102e37d am:
1c348395f5 am:
26fda93676 skipped:
cf76183e6c
am:
cf81345649
Change-Id: I8f2f2edaaa607378d75e3c852d0b8cedbc4fbb67
Wyatt Riley [Mon, 4 Mar 2019 14:29:06 +0000 (14:29 +0000)]
Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev
WyattRiley [Thu, 28 Feb 2019 19:43:12 +0000 (11:43 -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 with test thread sleep and verify fix
Change-Id: Icd2ea91d71da71c8fda109ceb70514733d35060b
Android Build Merger (Role) [Fri, 1 Mar 2019 21:01:49 +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 skipped:
cf76183e6c
Change-Id: Ifd0a52ac469b9d59aa43b3849b5cfbabeac99ed5
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
Abodunrinwa Toki [Fri, 8 Feb 2019 01:43:56 +0000 (17:43 -0800)]
[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device. am:
7c8a46e0dd -s ours
am:
67722b0557 -s ours
am skip reason: change_id I360250a5c2a92d09c8d8f559b51c74f490f70c2c with SHA1
9796a1bd00 is in history
Change-Id: I7a33224747c5eb233032dfa905112067d2c61c39
Abodunrinwa Toki [Fri, 8 Feb 2019 01:38:52 +0000 (17:38 -0800)]
[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device.
am:
7c8a46e0dd -s ours
am skip reason: change_id I360250a5c2a92d09c8d8f559b51c74f490f70c2c with SHA1
9796a1bd00 is in history
Change-Id: I431250313c81a1aee082503e3b39798ff4e5056e
Abodunrinwa Toki [Wed, 28 Jun 2017 01:49:07 +0000 (02:49 +0100)]
DO NOT MERGE No smart text assist for unprovisioned device.
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit FrameworksCoreTests:android.widget.TextViewActivityMoutseTest
Bug:
120866126
Bug:
62745625
Merged-In: I360250a5c2a92d09c8d8f559b51c74f490f70c2c
Change-Id: I360250a5c2a92d09c8d8f559b51c74f490f70c2c
Guliz Tuncay [Fri, 11 Jan 2019 00:44:22 +0000 (16:44 -0800)]
[automerger skipped] [automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522 am:
276e18c147 am:
d962aabf4c am:
3c2abaa4da
am:
04206067b9 -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1
dd8b0a6bc8 is in history
Change-Id: I8be93eede6f7dcffc94905b5a790b1a813f28699
Bryan Ferris [Fri, 11 Jan 2019 00:36:37 +0000 (16:36 -0800)]
[automerger skipped] [automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7 am:
1684713f2e am:
cd6eba50ba am:
576e4ac184
am:
d596c0e4ef -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1
dd8b0a6bc8 is in history
Change-Id: Ie171e4463c7d5ba062f5c978c47ff5560037acb6
Guliz Tuncay [Fri, 11 Jan 2019 00:21:07 +0000 (16:21 -0800)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522 am:
276e18c147 am:
d962aabf4c
am:
3c2abaa4da
Change-Id: I2b4a8618280a602b4eb42db9bf822a14324b587f
Bryan Ferris [Fri, 11 Jan 2019 00:14:19 +0000 (16:14 -0800)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7 am:
1684713f2e am:
cd6eba50ba
am:
576e4ac184
Change-Id: I304213f41d8b6f499d022f453392234ae901b36c
Android Build Merger (Role) [Thu, 10 Jan 2019 17:55:03 +0000 (17:55 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
ed5973b8a8 am:
5ab7f995ba am:
d71a5db522 am:
276e18c147 am:
d962aabf4c
Change-Id: I4fa4b56b1472ed6c25bc431ef9ce8060cb04a1f1
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:52 +0000 (00:44 +0000)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am:
170e24d4e1 am:
fb3b187f10 am:
7abf49d3b7 am:
1684713f2e am:
cd6eba50ba
Change-Id: I9b15a7332565cc39eee4abb9faccb2d148281bf0
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
Bryan Ferris [Thu, 10 Jan 2019 00:04:26 +0000 (16:04 -0800)]
Empty commit for automerge manipulation
The backport for nyc-dev through oc-dev in b/
118694079 was improperly
applied. Therefore, we need to apply changes to oc-dev but not
oc-mr1-dev. Since the different CL's had the same Change ID we cannot
use MERGED IN with the original Change ID, and RESTRICT AUTOMERGE
can't stop us from jumping to oc-mr1-dev. This commit gives us a
Change ID that we can use for proper behavior.
Test: No code or configuration changes were made in this CL
Bug:
118694079
Change-Id: Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9
Adrian Roos [Tue, 8 Jan 2019 18:45:44 +0000 (18:45 +0000)]
Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into oc-mr1-dev
Tony Mak [Tue, 8 Jan 2019 12:33:52 +0000 (04:33 -0800)]
Merge changes from topic "am-
5969704d-c4c1-4e63-afae-
e851b95f3e2b" into oc-dev am:
5ee2efb484
am:
340620b4cb
Change-Id: I9b544c70edf909ad82edf45207286168e63ffcd6
Tony Mak [Tue, 8 Jan 2019 12:18:40 +0000 (04:18 -0800)]
Merge changes from topic "am-
5969704d-c4c1-4e63-afae-
e851b95f3e2b" into oc-dev
am:
5ee2efb484
Change-Id: I03962452c1ff5c3a25ed319e7b32e209f8fab5f4
TreeHugger Robot [Tue, 8 Jan 2019 11:55:30 +0000 (11:55 +0000)]
Merge changes from topic "am-
5969704d-c4c1-4e63-afae-
e851b95f3e2b" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557 am:
b2b98a008b skipped:
3823545fee
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557 am:
b2b98a008b
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306
RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
Adrian Roos [Mon, 7 Jan 2019 15:57:31 +0000 (16:57 +0100)]
DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e
Fixes an issue where setting a password via DPM would never
satisfy a QUALITY_COMPLEX password requirement.
Change-Id: I3fbc952bd44291ac22728c626b128fc0c1aae232
Merged-In: I3fbc952bd44291ac22728c626b128fc0c1aae232
Fixes:
120915644
Bug:
110172241
Test: atest 'com.android.cts.devicepolicy.DeviceAdminHostSideTestApi24#testRunDeviceOwnerPasswordTest'
Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows.
Tony Mak [Tue, 8 Jan 2019 11:01:16 +0000 (03:01 -0800)]
[automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
d9e75a497e
am:
3f552669e3 -s ours
am skip reason: change_id Ib2ee544b5783234fba8ee2f93adf0b36b039520f with SHA1
4e3507d544 is in history
Change-Id: I71dac905e55f732d839549d15700ee6d4db537e7
Tony Mak [Tue, 8 Jan 2019 10:50:57 +0000 (02:50 -0800)]
RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.
am:
d9e75a497e
Change-Id: Id1b62f552f29ef9a20d78bb7487201452dfda601
Abodunrinwa Toki [Fri, 4 Jan 2019 17:18:39 +0000 (17:18 +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: Ib2ee544b5783234fba8ee2f93adf0b36b039520f
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: Ib2ee544b5783234fba8ee2f93adf0b36b039520f
Merged-In: Ib2ee544b5783234fba8ee2f93adf0b36b039520f
Android Build Merger (Role) [Thu, 3 Jan 2019 14:08:07 +0000 (14:08 +0000)]
[automerger] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am:
73f398d306 am:
363e47e676 am:
efb165f557 am:
b2b98a008b skipped:
3823545fee
Change-Id: I3c673c0d4337914308f5cdd1081e564f96cc3383
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
WyattRiley [Fri, 21 Dec 2018 19:17:41 +0000 (11:17 -0800)]
[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0 skipped:
46f972fea5 am:
5cf98f1399 -s ours
am:
5420e91d1e -s ours
Change-Id: I9ca3e797b1efe6c41e3dd958dd2657a467f690f7
WyattRiley [Fri, 21 Dec 2018 19:07:09 +0000 (11:07 -0800)]
[automerger skipped] [automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0 skipped:
46f972fea5
am:
5cf98f1399 -s ours
Change-Id: Ic83aa8cd0eb564e27264dfb3f929bc86fe7ec4f6
Android Build Merger (Role) [Fri, 21 Dec 2018 16:50:53 +0000 (16:50 +0000)]
[automerger] Adding SUPL NI Emergency Extension Time am:
64306e1e7b am:
882e4e7ba0 am:
478d13d664 am:
17232346f0 skipped:
46f972fea5
Change-Id: I93997d7383990bd70492944411196c8fbb6b319e
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 [Fri, 21 Dec 2018 01:31:48 +0000 (17:31 -0800)]
Adding SUPL NI Emergency Extension Time am:
1cd7883a76
am:
75c5850b4c
Change-Id: I8a8d54e909fcf43f3ce421b5f893337251544e75
WyattRiley [Fri, 21 Dec 2018 01:23:22 +0000 (17:23 -0800)]
Adding SUPL NI Emergency Extension Time
am:
1cd7883a76
Change-Id: I22286211589cbcc8739c5dfed3a839bada35646a
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
OSDN Git Service
