Commit Graph

257955 Commits

Author SHA1 Message Date
Svet Ganov
cf7b579868 DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
am: 4a601f972a  -s ours

Change-Id: Id66c49cfa6010ab327f46e85a6940bd52102eeea
2017-01-18 21:04:19 +00:00
Svet Ganov
4a601f972a DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.
Bug: 34193954

Change-Id: Id744fd190ef78e498e635c2ab9936f12d0bbc917
(cherry picked from commit 6130fb741c)
2017-01-18 11:10:15 -08:00
Kenny Guy
748e78bd2c Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed
am: 1894632864

Change-Id: I4328578f929875fd59f48681b8ae2c7c4d3bd623
2017-01-18 17:47:02 +00:00
Kenny Guy
1894632864 Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af
am: ee9f03d1ed

Change-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05
2017-01-18 17:33:33 +00:00
Kenny Guy
ee9f03d1ed Fix issue with saving admins before finishing loading. am: f98ed6863a
am: b275a205af

Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
2017-01-18 17:27:10 +00:00
Kenny Guy
b275a205af Fix issue with saving admins before finishing loading.
am: f98ed6863a

Change-Id: I7f816c164548df86f9607c86772902efd0d53620
2017-01-18 17:13:31 +00:00
Tucker Sylvestro
eed0a7bf45 svc nfc should support watches too
am: 1876583bfb

Change-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297
2017-01-18 16:34:50 +00:00
Tucker Sylvestro
1876583bfb svc nfc should support watches too
Check for both FEATURE_NFC and FEATURE_NFC_HOST_CARD_EMULATION in the
"svc nfc" command.  Watches may only have the latter, but should still
support the nfc enable/disable command.

See b/24532713#comment7 for context.

Bug 32386425

Change-Id: I307798f00728c6b437aebfcf58115af7265e3692
2017-01-18 10:27:38 -05:00
Kenny Guy
f98ed6863a Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.

Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services

Bug: 34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
(cherry picked from commit adbda7474c)
2017-01-18 12:01:55 +00:00
Sunny Goyal
13f18efb8f Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev 2017-01-18 01:45:55 +00:00
Makoto Onuki
5e2634ba55 Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev 2017-01-18 01:26:59 +00:00
Kenny Guy
adbda7474c Fix issue with saving admins before finishing loading.
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.

Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services

Bug: 34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
2017-01-17 23:37:57 +00:00
Svetoslav Ganov
70c0f5c2c7 Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0
am: df459cb2ea

Change-Id: I1239cde924e6d31222bf108c6d55ff19a78019ad
2017-01-17 23:03:42 +00:00
Svetoslav Ganov
f5111345d2 [DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5
am: a7ff8fbe74

Change-Id: Ic372436ee48a9f725c178a72c057a2192aad9267
2017-01-17 23:02:52 +00:00
Svetoslav Ganov
df459cb2ea Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev
am: 332762aaf0

Change-Id: I20cc197cc2f1d4d9dd0b6b6c6fee07e71dd4a1d3
2017-01-17 22:58:21 +00:00
Svetoslav Ganov
a7ff8fbe74 [DO NOT MERGE] Prevent crash from early Toast surface destruction.
am: 016c9c8cb5

Change-Id: Ib33d75a050a1b79de9590f2dbe03609c6e2b4463
2017-01-17 22:58:18 +00:00
Selim Cinek
c8278f35c7 Merge "Not allowing foreground services to be cleared as children" into nyc-mr2-dev 2017-01-17 22:57:13 +00:00
TreeHugger Robot
332762aaf0 Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev 2017-01-17 22:53:42 +00:00
Svet Ganov
20cf769d96 DO NOT MERGE: Propagate revoked permissions in permission review mode
am: 4518d0be16

Change-Id: Id0525c380c7b9aaf8c160b1e4fad24b9b2756a0d
2017-01-17 22:27:40 +00:00
Svet Ganov
4518d0be16 DO NOT MERGE: Propagate revoked permissions in permission review mode
In permission review mode we represent install permissions for legacy
apps as constantly granted runtime ones since we need to keep per
user flags associated with a permission. We were not propagating
a revoked permission for a legacy app when the later is upgraded to
a modern app when permission review is enabled.

Test: CTS test passes and manual testing worked fine

Bug: 34240393
Change-Id: I32b8ffee89cc034661f8eb5a172dbe2349ea4a18
(cherry picked from commit fe0253b34e)
2017-01-17 22:14:39 +00:00
TreeHugger Robot
31b755adea Merge "DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"" into nyc-mr2-dev 2017-01-17 22:01:24 +00:00
Manu Cornet
a4b7d794b3 Merge "2D Recents: Always use grid layout even in split view" into nyc-mr2-dev 2017-01-17 21:58:08 +00:00
Manu Cornet
c0432c63de 2D Recents: Always use grid layout even in split view
Simplify the logic a bit, and polish the algorithm to accommodate the
various layout possibilities.

Bug: 32101881
Test: Checked layout in all orientations, with and without split view
Change-Id: I4a6dd3f7f34664908294ddaf5ea516d8e258edbf
2017-01-17 13:56:07 -08:00
Jesse Hall
e8ce1276e2 DO NOT MERGE Revert "Stop preloading EGL/GLES in Zygote"
This reverts commit 93f630e1c3.
Change has already been reverted in master, hence DO NOT MERGE.

Bug: 34348911
2017-01-17 12:34:14 -08:00
TreeHugger Robot
ebf7abb19e Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev 2017-01-17 18:42:46 +00:00
Jesse Hall
79bf392dc6 Create GraphicsEnvironment for communicating with driver loaders
The GraphicsEnvironment class is given information during application
start, and makes it available to EGL/GLES/Vulkan loaders that don't
have easy access to the VM or to the application Context. Currently
only the driver path is handled, but the existing support for setting
library paths (for Vulkan extensions) and cache directory information
should move here.

Bug: 33531483
Change-Id: I4e4e7fb21f1bcc67122e9173514af5f18c063991
Merged-In: I5820d3d1301d5461e10706f551b268c54d4f8926
2017-01-14 19:19:28 -08:00
TreeHugger Robot
a959ccbc33 Merge "Stop preloading EGL/GLES in Zygote" into nyc-mr2-dev 2017-01-14 05:54:18 +00:00
Jesse Hall
93f630e1c3 Stop preloading EGL/GLES in Zygote
It's not clear this actually makes much difference on modern
devices/drivers. With updatable graphics drivers, we'd have to be able
to unload the preloaded driver from processes that don't use the
system driver, which is additional complexity and risk.

On bullhead and sailfish, meminfo actually showed slightly more memory
available while sitting at launcher just after boot with this change
than previously. Looking at detailed stats, the differences appeared
to mostly within run-to-run variation, but there wasn't evidence of a
regression.

Bug: 33531483
Test: boot through lockscreen/launcher
Change-Id: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75
Merged-In: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75
2017-01-13 20:09:57 -08:00
Wei Liu
692089376b Merge "Add WearCellularMediatorService to the system server." into cw-f-dev
am: 7a6c54128a

Change-Id: Ide990adaf580e1e5b06a24484c13c090746d65fa
2017-01-14 03:58:19 +00:00
Wei Liu
6760890c38 Add WearCellularMediatorService to the system server.
am: d741f3de81

Change-Id: Ica3d90c3748d79b28bf9cad1b3b5468f919e7299
2017-01-14 03:51:52 +00:00
TreeHugger Robot
7a6c54128a Merge "Add WearCellularMediatorService to the system server." into cw-f-dev 2017-01-14 03:46:09 +00:00
Wei Liu
d741f3de81 Add WearCellularMediatorService to the system server.
Bug: 33589216
Change-Id: Icfee08b27c03567ed45e136fc407b51c768515c2
2017-01-13 17:51:07 -08:00
TreeHugger Robot
0e099a283e Merge "Treat Latin American locales specially" into nyc-mr2-dev 2017-01-14 01:02:46 +00:00
Selim Cinek
1d35979f0a Not allowing foreground services to be cleared as children
forground service notifications could simply be cleared
when they were sent as notification children and then
the summary was cancelled.

This also cleans up the logic in systemui and only removes
the child if allowed.

The clear all button could also show under certain conditions
where it shouldn't have been shown.

Change-Id: I85998b5342bd75425cc6d68e96391299c4f3d83d
Test: manual
Bug: 33766648
2017-01-13 16:49:48 -08:00
Sudheer Shanka
bdd0a2b14a Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev 2017-01-14 00:10:08 +00:00
Muyuan Li
659a650141 Merge "update navbar assets for sw900dp device." into nyc-mr2-dev 2017-01-13 21:49:55 +00:00
Chris Craik
4638ef17d5 Merge "Support shadows and reordering in ViewOverlay" into nyc-mr2-dev 2017-01-13 21:46:55 +00:00
Andrew Scull
32992b4049 Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c
am: b2db3761cd

Change-Id: I166a09f1b41c32bb69e2859ef262b9d46996ac87
2017-01-13 21:17:23 +00:00
Andrew Scull
3c9b36482f resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969
am: 3aac3ebee1

Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a
2017-01-13 21:16:31 +00:00
Philip P. Moltmann
0dfa7b58b8 Do not write if apply() did not change the file. am: 1f99f81bdc
am: 331a4bb8d4

Change-Id: If200192c12477a4410b0b358e6c7b430c23d1499
2017-01-13 21:15:18 +00:00
Philip P. Moltmann
2288ee6b01 Only persist last Shared Preferences state am: d15c4f1da5
am: 889a420a9e  -s ours

Change-Id: I1e440bdfc8d12f30eb6db95b365c15b66479d95d
2017-01-13 21:14:17 +00:00
Justin Klaassen
482ba6b831 Merge "Add support for carrier demo mode" into nyc-mr2-dev 2017-01-13 21:00:08 +00:00
Pankaj Kanwar
ae9e15fa44 Merge "DO NOT MERGE: Fix to maintain the Carrier Network connection." into nyc-mr2-dev 2017-01-13 20:46:02 +00:00
TreeHugger Robot
409d93356c Merge "Add logging for high temp warning." into nyc-mr2-dev 2017-01-13 20:24:50 +00:00
TreeHugger Robot
a4d01c8573 Merge "DO NOT MERGE - 2D Recents: Make sure thumbnail fills task view in all orientations" into nyc-mr2-dev 2017-01-13 19:54:20 +00:00
Justin Klaassen
b632c55469 Add support for carrier demo mode
Fixes: 33746309
Test: manually verified carrier demo mode and normal demo mode are setup
correctly

Change-Id: Ia38790599f672a9d1999274276156b5328c9f75a
2017-01-13 09:26:58 -08:00
Andrew Scull
b2db3761cd Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473 am: ea9463f542
am: 66d66dd50c

Change-Id: Ic622d551181566585be89380e32658e963768cbf
2017-01-13 17:18:42 +00:00
Andrew Scull
3aac3ebee1 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev
am: eb35ad9969

Change-Id: I4fd9ce4c79db5a10f28008c89205fc9c8ef2888f
2017-01-13 17:17:49 +00:00
Andrew Scull
66d66dd50c Merge "Don't save password metrics to disk." into nyc-dev am: 97848fc473
am: ea9463f542

Change-Id: I76b21c0ea4ab7394281ee8c82ed67179eb9ea966
2017-01-13 17:09:51 +00:00
Andrew Scull
eb35ad9969 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
2017-01-13 15:28:36 +00:00