Commit Graph

361454 Commits

Author SHA1 Message Date
Ashutosh Joshi
dda8a67ea1 Merge "Merge "Update OWNERS" into pi-dev am: 196cf03f44" into pi-dev-plus-aosp
am: b3083ee21b

Change-Id: I0d3bc67dd8585e0231f0544c92b49be1c4864d24
2018-03-07 02:17:26 +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
Jaewan Kim
099d04386d Merge "MediaSession2: Ask server whether a controller is trusted" into pi-dev am: e9238246b7
am: 98515b88e1

Change-Id: Ia5a1df86cf5900e546432bc5bf581e5b967e1519
2018-03-07 01:46:08 +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
Vadim Tryshev
f4772b164c Merge "Exclude from Recents Assistant in half-screen mode" into pi-dev am: 69598bbef5
am: 1f0d78f3d4

Change-Id: I3769d41ff998d97890e47371ed1608c68eae493a
2018-03-07 01:32:26 +00:00
Chen Xu
f0976992c8 Merge "API review: rename CarrierIdentification to Carrier id" into pi-dev am: b15225cd88 -s ours
am: 8bb51214d9  -s ours

Change-Id: I3057658acf0b17222a0508d72e7fa87b8c9f49ea
2018-03-07 01:28:24 +00:00
Ng Zhi An
f6f5dfdb16 Merge "Add more tests for MemoryStatUtil" into pi-dev am: d4033e8eac
am: 6851b179cb

Change-Id: I455e7c972903d9a7609e015860ad5a848a5d8a2a
2018-03-07 01:24:57 +00:00
Michael West
6661db4638 Merge "Add set-time and set-timezone shell cmds to alarm service" into pi-dev am: 0d155259be
am: d9c83159d0

Change-Id: I442741a6f8ad9be6dad4c673a90cabe72e9135dd
2018-03-07 01:06:50 +00:00
Android Build Merger (Role)
b3083ee21b Merge "Merge "Update OWNERS" into pi-dev am: 196cf03f44" into pi-dev-plus-aosp 2018-03-07 00:57:43 +00:00
Ashutosh Joshi
b330589c01 Merge "Update OWNERS" into pi-dev
am: 196cf03f44

Change-Id: I50797bfaef1f597474e7530b5d5acf92cc705773
2018-03-07 00:57:14 +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
Jaewan Kim
98515b88e1 Merge "MediaSession2: Ask server whether a controller is trusted" into pi-dev
am: e9238246b7

Change-Id: I98a5173e49a7a90236131ca31c5d201cd9d59049
2018-03-07 00:25:15 +00:00
Beverly
f1f610d9a9 Merge "Update default charging sound to new sound" into pi-dev am: 6ee203d632
am: 07b28ef562

Change-Id: I5a622af20a7d6b13c8e256c691fc673d80120a3c
2018-03-07 00:22:37 +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
Patrick Baumann
c6bb822232 Merge "Adds instant app visibility to instumentation" into pi-dev am: c0f025b253
am: e5c12bee08

Change-Id: I99c141edb626c1ee7b1d0545af2c684e8225880e
2018-03-07 00:19:00 +00:00
Bill Yi
fcf451b72c Merge "Import translations. DO NOT MERGE" into pi-dev am: 4f22580938 -s ours
am: 1468eb45d7  -s ours

Change-Id: Ibf2e9961f5f314f2928bdec632f4fb9ab1d71faf
2018-03-07 00:16:00 +00:00
Bill Yi
14337f6699 Merge "Import translations. DO NOT MERGE" into pi-dev am: 51239f23dc -s ours
am: ae45c5e599  -s ours

Change-Id: I7269ad78180fcad7a9a0c48530d89699d89ed988
2018-03-07 00:15:34 +00:00
Bill Yi
7913eed2b1 Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ed02e2060 -s ours
am: 8258cfd64e  -s ours

Change-Id: If921a98c4fc2bbb06722c25becf8f0aa2b92e6bd
2018-03-07 00:15:08 +00:00
Bill Yi
dacf1d3d8b Merge "Import translations. DO NOT MERGE" into pi-dev am: 344907b937 -s ours
am: 830d632e70  -s ours

Change-Id: I249d2d451c5619a5e4ae34315e5a43b3872bedff
2018-03-07 00:14:46 +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
Bill Yi
9507ace619 Merge "Import translations. DO NOT MERGE" into pi-dev am: 6ae8c53786 -s ours
am: 01cbefa877  -s ours

Change-Id: Ida4c74e9644decdf05bf049a04275a929bb6989c
2018-03-07 00:14:24 +00:00
Bill Yi
434271ffad Merge "Import translations. DO NOT MERGE" into pi-dev am: 8e7bfb494f -s ours
am: 4baa37fee5  -s ours

Change-Id: I56cf9b29790252beb55e6a57e19057b37dab5401
2018-03-07 00:14:01 +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
Bill Yi
08a15f9687 Merge "Import translations. DO NOT MERGE" into pi-dev am: 1543a4ea0d -s ours
am: 6b052f1f4a  -s ours

Change-Id: Ic23370175993b19919579fa6a6bc790057a158fe
2018-03-07 00:10:29 +00:00
Bill Yi
468113b384 Merge "Import translations. DO NOT MERGE" into pi-dev am: 595dd3f75a -s ours
am: 3b60e2c77b  -s ours

Change-Id: I9c486ee49fe7c6e679cd3b9106d75f0abdd836ff
2018-03-07 00:10:03 +00:00
Chavi Weingarten
fe1d7218a2 Merge "Only set appToken.setCanTurnScreenOn to false if screen was turned on." into pi-dev am: fb6531d3df
am: 928f3f28ee

Change-Id: I4182fae4057b8464735f9d56e39a93386bf5926a
2018-03-07 00:09:40 +00:00
Vadim Tryshev
1f0d78f3d4 Merge "Exclude from Recents Assistant in half-screen mode" into pi-dev
am: 69598bbef5

Change-Id: I987c6b077ce9ced4feab26626436ec0b7dc3401b
2018-03-07 00:08:47 +00:00
Lucas Dupin
7188b875ef Merge "Increase char limit of keyguard messages" into pi-dev am: 8715cf78f1
am: 9ed24f902a

Change-Id: Ieb547a0893d55e98ae785da6cf012d155eb2b963
2018-03-07 00:06:59 +00:00
Chen Xu
8bb51214d9 Merge "API review: rename CarrierIdentification to Carrier id" into pi-dev
am: b15225cd88  -s ours

Change-Id: If0d1609851f71cdab2107612bcd69f089c1bf100
2018-03-07 00:05:26 +00:00
Bill Yi
4a5d79f995 Merge "Import translations. DO NOT MERGE" into pi-dev am: 45e75a9c4c -s ours
am: 42f2594487  -s ours

Change-Id: I4936df34b97870375dd30bb77ba2ad025d3898d0
2018-03-07 00:03:27 +00:00
Hall Liu
90e43a97bf Merge "Add an app-ops check when registering for location" into pi-dev am: 67f9d52502
am: 2351526cc8

Change-Id: Ie24886401152bcc1cdb99ff0c72805fe89f2a5ed
2018-03-07 00:02:55 +00:00
Ng Zhi An
6851b179cb Merge "Add more tests for MemoryStatUtil" into pi-dev
am: d4033e8eac

Change-Id: I61bb2caa61ed0801d85a6017a23a08686c47a51f
2018-03-07 00:02:46 +00:00
Michael West
d9c83159d0 Merge "Add set-time and set-timezone shell cmds to alarm service" into pi-dev
am: 0d155259be

Change-Id: I57521b0a5a467825cbe09e98fc52a491da90bc98
2018-03-06 23:52:42 +00:00
Julia Reynolds
45f7a601d3 Merge "metrics constants for app ops." into pi-dev am: 200de1cc86
am: e56a22248b

Change-Id: I5510e2b2e56761b574e4594a1edf02fb243c2ec0
2018-03-06 23:32:05 +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
Beverly
07b28ef562 Merge "Update default charging sound to new sound" into pi-dev
am: 6ee203d632

Change-Id: I150a8fd65ca145db7ddeb2e0a5ae7dd2a267a835
2018-03-06 23:16:37 +00:00
Ashutosh Joshi
196cf03f44 Merge "Update OWNERS" into pi-dev 2018-03-06 23:13:45 +00:00
Patrick Baumann
e5c12bee08 Merge "Adds instant app visibility to instumentation" into pi-dev
am: c0f025b253

Change-Id: I8a161d6eee0c8d4404edf19191f5b3b0d9fc2eec
2018-03-06 23:13:36 +00:00
Bill Yi
1468eb45d7 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 4f22580938  -s ours

Change-Id: Ic5e09f3594932428865354cf19a0e950e008b5df
2018-03-06 23:10:38 +00:00
Bill Yi
ae45c5e599 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 51239f23dc  -s ours

Change-Id: I32c041efc02bfffcf91d690d2a362cccadeca1b1
2018-03-06 23:10:12 +00:00
Bill Yi
8258cfd64e Merge "Import translations. DO NOT MERGE" into pi-dev
am: 7ed02e2060  -s ours

Change-Id: I79377ddd3573edd760b35b24db9324f965c9503e
2018-03-06 23:09:40 +00:00
Bill Yi
830d632e70 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 344907b937  -s ours

Change-Id: I9ff71f760f9a1a721d17ee3129672c3cf4a6b0d2
2018-03-06 23:09:05 +00:00
Bill Yi
01cbefa877 Merge "Import translations. DO NOT MERGE" into pi-dev
am: 6ae8c53786  -s ours

Change-Id: I56ec26843c1e07d99da1e71df231ffc74b2b3417
2018-03-06 23:07:44 +00:00
TreeHugger Robot
e9238246b7 Merge "MediaSession2: Ask server whether a controller is trusted" into pi-dev 2018-03-06 23:06:18 +00:00