Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
361,391 Commits 3 Branches 0 Tags
2208f90f6efe6a2bc4fa2549bdac1caa87087eab
Commit Graph

88344 Commits

Author SHA1 Message Date
Yueming Wang
19d708a0e6 Merge "Block adb from changing certain settings value when corresponding user restriction is on." into pi-dev 
am: aecd9616ec

Change-Id: I1adecc989ee77fe578e08b484edc57669937df99
 2018-03-07 13:54:19 +00:00
yuemingw
1d13eaea83 Block adb from changing certain settings value when corresponding user 
restriction is on.

Check calling uid in isSettingRestrictedForUser(which is called by settingsprovider),
 and only allow system_uid when certain user restriction is on, so that user won't be
able to change these settings with adb:
Settings.Secure.LOCATION_MODE,
Settings.Secure.PROVIDERS_ALLOWED,
Settings.System.SCREEN_BRIGHTNESS,
Settings.System.SCREEN_BRIGHTNESS_MODE,
Settings.System.SCREEN_OFF_TIMEOUT,
Settings.Global.AUTO_TIME,
Settings.Global.AUTO_TIME_ZONE.
This check also prevents 3rd party apps from modifying system settings value
when corresponding user restriction is on.
In addition, any attempt to change AUTO_TIME will also go through the check
for dpm.getAutoTimeRequired().

Test: manually by running the adb command with restriction set and not set
Bug: 72549013
Bug: 72548203
Bug: 72548533
Bug: 72686466
Bug: 72687105
Bug: 72940551
Bug: 72940562
Change-Id: I1d1fd20d9fa0f76f27905d62873f6a6e9af0224e
 2018-03-07 11:04:34 +00:00
TreeHugger Robot
1eb1ff31fc Merge "Remove toString() for CarrierIdentifier." into pi-dev 2018-03-07 03:44:31 +00:00
jackqdyulei
f50bd6f511 Merge "Add APP_AUTO_RESTRICTION_ENABLED" into pi-dev 
am: 9aa32d0e71

Change-Id: I79ad9035fcbbf0935e547b518d5a937400aa2a4c
 2018-03-07 03:29:05 +00:00
Scott Main
6cf55a5332 Merge "Fix javadoc typo causing broken links" into oc-mr1-dev am: ac2cdc0dba 
am: 655d98bdb5

Change-Id: I267705cb7dc4ea6696058f1b3051e5f1c6ef5f7e
 2018-03-07 03:11:26 +00:00
Doris Ling
fd104a772e Merge "Add feature flag for audio output switcher." into pi-dev 
am: d7cf0e1635

Change-Id: I3631580417c47d5bb20296d171cfccb80c5114e0
 2018-03-07 03:08:06 +00:00
TreeHugger Robot
9aa32d0e71 Merge "Add APP_AUTO_RESTRICTION_ENABLED" into pi-dev 2018-03-07 02:32:17 +00:00
Scott Main
655d98bdb5 Merge "Fix javadoc typo causing broken links" into oc-mr1-dev 
am: ac2cdc0dba

Change-Id: Ib8d63b1bfcc20e398314501a51bd2fad76a8d10e
 2018-03-07 01:54:15 +00:00
Scott Main
bda0cc9c3c Fix javadoc typo causing broken links 
Change-Id: I988e06100562c574bbda1bb530359da289062d65

bug: 74262753
 2018-03-07 01:39:29 +00:00
TreeHugger Robot
d7cf0e1635 Merge "Add feature flag for audio output switcher." into pi-dev 2018-03-07 01:38:53 +00:00
Tarandeep Singh
327c666924 Merge "IME API: rename IMS methods." into pi-dev 
am: 2b00eaed27

Change-Id: Ia369b8fef6c1c9b7bc9e77059919e4508f1db743
 2018-03-07 01:31:05 +00:00
Holly Jiuyu Sun
5ba83250d8 Merge "Remove toString() for CarrierIdentifier." am: e33b9f6234 
am: a77bf7c48b

Change-Id: I2b3e22e0c1721009f9202c065fa1da22a01e8630
 2018-03-07 00:48:46 +00:00
Holly Jiuyu Sun
435c213e9d Remove toString() for CarrierIdentifier. 
We may get NPE if mCarrierIdentifier is null. + should convert it to
string by itself.

Test: test on phone
Merged-In: Ibd352d6d2a9b0cb33a494d108eb0d3a7c1dbc61b
Change-Id: Ibd352d6d2a9b0cb33a494d108eb0d3a7c1dbc61b
 2018-03-06 16:40:27 -08:00
Holly Jiuyu Sun
a77bf7c48b Merge "Remove toString() for CarrierIdentifier." 
am: e33b9f6234

Change-Id: I6cbae2674c56f5cd99a6c7814f22dc9e8563d974
 2018-03-07 00:39:56 +00:00
TreeHugger Robot
2b00eaed27 Merge "IME API: rename IMS methods." into pi-dev 2018-03-07 00:19:55 +00:00
Mike Digman
289bf049c3 Merge "Reset user rotate pref on navbar create" into pi-dev 
am: 4ef95e2531

Change-Id: Id8097c24ca07284f31ac7fc16f3b776e19a7f297
 2018-03-07 00:19:47 +00:00
Dianne Hackborn
e1d41bd8fa Merge "Fix issue #72116995: Add permission guarding Service#startForeground" into pi-dev 
am: 16268a69d6

Change-Id: I6ef5335e391eb9259ae0dfbf4f88032ad1d2bad4
 2018-03-07 00:14:27 +00:00
Rubin Xu
74ff1dad95 Merge "Stop invoking secdiscard when deleting password data" into pi-dev 
am: 8fa420c261

Change-Id: I73db72842b5b561980aa7ba7c56253c17bec00c5
 2018-03-06 23:27:18 +00:00
Sunny Goyal
b524685bbc Merge "Using UserManagerInternal for access control instead of UserManager" into pi-dev 
am: 9015d24332

Change-Id: I3e05cf00e1376c5790ac7acdf991e0668027c076
 2018-03-06 23:21:18 +00:00
Doris Ling
1af6f81488 Add feature flag for audio output switcher. 
Bug: 74130772
Test: rebuild
Change-Id: I06224975550ab4017d1546b182af083a36c0eacc
 2018-03-06 15:17:10 -08:00
Holly Jiuyu Sun
e33b9f6234 Merge "Remove toString() for CarrierIdentifier." 2018-03-06 23:16:54 +00:00
Mike Digman
4ef95e2531 Merge "Reset user rotate pref on navbar create" into pi-dev 2018-03-06 23:04:54 +00:00
Dianne Hackborn
16268a69d6 Merge "Fix issue #72116995: Add permission guarding Service#startForeground" into pi-dev 2018-03-06 23:04:16 +00:00
Lucas Dupin
13100c09ea Merge "WallpaperColors hint computation" into pi-dev 
am: 29d047bab8

Change-Id: I120590fe320065573eafa32fbf6ab4807495dc11
 2018-03-06 22:45:35 +00:00
TreeHugger Robot
8fa420c261 Merge "Stop invoking secdiscard when deleting password data" into pi-dev 2018-03-06 22:37:43 +00:00
TreeHugger Robot
9015d24332 Merge "Using UserManagerInternal for access control instead of UserManager" into pi-dev 2018-03-06 22:37:09 +00:00
TreeHugger Robot
29d047bab8 Merge "WallpaperColors hint computation" into pi-dev 2018-03-06 22:16:50 +00:00
jackqdyulei
3cd42a0a04 Add APP_AUTO_RESTRICTION_ENABLED 
This config is used in aosp to auto restrict anomaly app.
Also add it to backup, dump and proto.

Bug: 73002171
Test: Build
Change-Id: I3d198e8856e2431f9ab7350a6dd897f1a6010002
Merged-In: I3d198e8856e2431f9ab7350a6dd897f1a6010002
(cherry picked from commit 1d9c0aa940)
 2018-03-06 21:33:37 +00:00
Jeffrey Vander Stoep
c6667aada1 Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" into pi-dev 
am: 1d03b9489e

Change-Id: I1fcbe7768bc34528b900dd47218fedc7d06ce661
 2018-03-06 20:59:08 +00:00
TreeHugger Robot
1d03b9489e Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" into pi-dev 2018-03-06 20:14:26 +00:00
Siddharth Ray
a09adc6db1 Merge "Obtain cellular related battery statistics" 
am: 4b0172bcb6

Change-Id: I364d329e92a6bd92ce601d34c94a92c91f09eb38
 2018-03-06 20:08:15 +00:00
Eric Erfanian
1a59a97a0c Merge "Update the RTT features constant." 
am: c18b175d87

Change-Id: Ic4419be53f3390336a5b95abe34a03944b3437e4
 2018-03-06 19:58:14 +00:00
Remi NGUYEN VAN
d2832e320b Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a 
am: a6905db1d8

Change-Id: I1e4e283c6eaecf33d12488e41e0c524f6ff83954
 2018-03-06 19:52:57 +00:00
Andrew Grieve
e7bb5673fe Merge "Expose Process.isIsolated()" into pi-dev 
am: 6ddf443d15

Change-Id: I02cb0a0bb503201ea4b4e9ca4961e5687a51e6d8
 2018-03-06 19:45:12 +00:00
Mike Digman
ab65025833 Reset user rotate pref on navbar create 
System appears in portrait after restart, however rotation
watcher callbacks don't fire leaving user rotate pref stale
from last boot. Reset in onCreate and replace override logic
with policy's natural rotation.

Test: manual
Change-Id: Ia1f1e5f637708e5c678edbb5cbf9f4125e451103
 2018-03-06 11:40:03 -08:00
Remi NGUYEN VAN
a6905db1d8 Merge "Allow null subscriberId in NetworkStatsManager." 
am: 6bd13af46a

Change-Id: I900ac14224284fc3a1422e8791bc54d6a9ee77ba
 2018-03-06 19:37:13 +00:00
TreeHugger Robot
6ddf443d15 Merge "Expose Process.isIsolated()" into pi-dev 2018-03-06 19:20:47 +00:00
Treehugger Robot
4b0172bcb6 Merge "Obtain cellular related battery statistics" 2018-03-06 18:19:20 +00:00
Lucas Dupin
106df024b6 Merge "WallpaperColors.fromDrawable Drawable mutation" into pi-dev 
am: 1c6e3ba66d

Change-Id: I75f1594b938679919d531ff9b27b43e0a59a433d
 2018-03-06 17:56:39 +00:00
Lucas Dupin
1c6e3ba66d Merge "WallpaperColors.fromDrawable Drawable mutation" into pi-dev 2018-03-06 17:34:48 +00:00
Andrew Grieve
0fec93682e Expose Process.isIsolated() 
Rather than have a process attempt to perform IO / IPC and check if it
fails, it makes much more sense to expose this getter.

My specific motivation for exposing this information more directly is to
be able to perform process-specific initialization logic in
Application.attachBaseContext():

https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java?rcl=ac2e180a1265f88dd4030bb35d69f5d0b2dc488d&l=54

Bug: 73343822
Test: Same code that's used in Chrome via reflection.
Change-Id: I1505962679da36ac42401230b204bff7b3376b73
 2018-03-06 17:17:43 +00:00
Treehugger Robot
c18b175d87 Merge "Update the RTT features constant." 2018-03-06 16:07:16 +00:00
Tony Mak
6a6e20a432 Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev 
am: bf8137a7cd

Change-Id: I219b1d9246f4845e0d0100fd1490b3e2155caf32
 2018-03-06 15:46:32 +00:00
TreeHugger Robot
bf8137a7cd Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev 2018-03-06 15:23:18 +00:00
Jeffrey Vander Stoep
85d1b5c414 Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion" 
This reverts commit 8196fd9380.

Reason for revert: b/74214574

Bug: 74214574
Change-Id: I9602872238ccc8a49d8b200e5389995d597f1c3a
(cherry picked from commit 00b4fa8b13)
 2018-03-06 15:12:15 +00:00
Mathew Inwood
a9c56d53e6 Merge "Don't whitelist all system image apps." into pi-dev 
am: 3fbc54e609

Change-Id: I6eef88e7080c8c599494448b640ba0284cb30f6d
 2018-03-06 12:07:30 +00:00
TreeHugger Robot
3fbc54e609 Merge "Don't whitelist all system image apps." into pi-dev 2018-03-06 11:50:23 +00:00
Tony Mak
6a97535f28 Revert accidental change of isUsingUnifiedPassword javadoc 
Test: None

Change-Id: I72735b790ae37838917b2330b84a3cfef32ce7b8
 2018-03-06 11:34:08 +00:00
Mathew Inwood
6827f4a2c8 Don't whitelist all system image apps. 
Also include in system dump which packages are exempt from the api
restrictions.

This is a cherry-pick of 974290b032
from master.

Test: Verified that the device boots.
Bug: 64382372
Change-Id: Iaeca91478f53c8b4e9608246aab42bdb90f899bb
 2018-03-06 09:54:55 +00:00
Insun Kang
f3e9ee6587 Merge "VideoView2: Move MediaContolView2's hidden constant" into pi-dev 
am: 27ed96bf0c

Change-Id: I754bda631577db7179f0d7811b75a26a8a9c392a
 2018-03-06 08:59:05 +00:00