Commit Graph

88380 Commits

Author SHA1 Message Date
Tarandeep Singh
01041c97ff Merge "IME API: rename IMS methods." into pi-dev am: 2b00eaed27
am: 327c666924

Change-Id: I49cfc349a87cd6b9d116b67102178d0bf6219f3d
2018-03-07 03:38:54 +00:00
Holly Jiuyu Sun
5b11b4486e Merge "Remove toString() for CarrierIdentifier." am: e33b9f6234 am: a77bf7c48b
am: 5ba83250d8

Change-Id: Ia91fa8a7cbca7ca1cd0d4218f3f53292c9573e63
2018-03-07 02:11:14 +00:00
Mike Digman
d6d81047cb Merge "Reset user rotate pref on navbar create" into pi-dev am: 4ef95e2531
am: 289bf049c3

Change-Id: I1e250f7ef34205d419edb2330488d27535d08b7c
2018-03-07 01:41:55 +00:00
Dianne Hackborn
5e2b2444fe Merge "Fix issue #72116995: Add permission guarding Service#startForeground" into pi-dev am: 16268a69d6
am: e1d41bd8fa

Change-Id: I54e0f981b267dbd6ad3e956bac8505187baeffea
2018-03-07 01:36:41 +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
a77bf7c48b Merge "Remove toString() for CarrierIdentifier."
am: e33b9f6234

Change-Id: I6cbae2674c56f5cd99a6c7814f22dc9e8563d974
2018-03-07 00:39:56 +00:00
Rubin Xu
2b56a589b4 Merge "Stop invoking secdiscard when deleting password data" into pi-dev am: 8fa420c261
am: 74ff1dad95

Change-Id: Ic23dfdde38622bc83cf07e5d2befcd9521b41bea
2018-03-07 00:36:23 +00:00
Sunny Goyal
c053890f12 Merge "Using UserManagerInternal for access control instead of UserManager" into pi-dev am: 9015d24332
am: b524685bbc

Change-Id: I27041c8a8860dfb6edada58bb61f00a854f7961f
2018-03-07 00:25:29 +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
Lucas Dupin
7b1563683c Merge "WallpaperColors hint computation" into pi-dev am: 29d047bab8
am: 13100c09ea

Change-Id: I6248bb08920084d3ff3e1ee144ba553f6f3c11b7
2018-03-07 00:13:37 +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
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
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
Android Build Merger (Role)
a2b1bb961e Merge "Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a am: a6905db1d8 am: d2832e320b" 2018-03-06 20:48:50 +00:00
Remi NGUYEN VAN
87fbc0c9b8 Merge "Allow null subscriberId in NetworkStatsManager." am: 6bd13af46a am: a6905db1d8
am: d2832e320b

Change-Id: Ia84d2c7cc63bf8b8bf30f133e0382fd7103bf490
2018-03-06 20:48:32 +00:00
TreeHugger Robot
f4fcad476b Merge "Add APP_AUTO_RESTRICTION_ENABLED" 2018-03-06 20:48:28 +00:00
Andrew Grieve
1a8248a3b1 Merge "Merge "Expose Process.isIsolated()" into pi-dev am: 6ddf443d15" into pi-dev-plus-aosp
am: 8b2817d0e1

Change-Id: I496fef1dad9c8c62f0d0ccbeab5d5a05ef092cee
2018-03-06 20:26:43 +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
ac89b0e903 Merge "Throw an exception in case of parameter mismatch of precomputed text" 2018-03-06 19:13:20 +00:00
Lucas Dupin
d4424e791d Merge "WallpaperColors.fromDrawable Drawable mutation" into pi-dev am: 1c6e3ba66d
am: 106df024b6

Change-Id: Ib89ed33334322cc67a267a9d27212fd6a8684da4
2018-03-06 18:32:37 +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
Richard Ledley
4f8464de33 Merge "Don't use highlighting in non-selectable text. Also fixes potential discrepancy in indexes for Linkified entities." 2018-03-06 17:36:55 +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
Tony Mak
409e11d575 Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev am: bf8137a7cd
am: 6a6e20a432

Change-Id: I56677f1eac63fa2c9f97870808c2afd47c6da9a2
2018-03-06 16:14:12 +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
TreeHugger Robot
e4936647e9 Merge "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion"" 2018-03-06 14:43:35 +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