Jeffrey Vander Stoep
|
8de5748e4e
|
Merge "pm: Modify getPackage() to only return non-null packages"
|
2018-03-07 03:03:54 +00:00 |
|
Android Build Merger (Role)
|
095d7cc5b0
|
Merge "Merge changes from topic "session2-pi-listcallback" into pi-dev am: ccf41b87a9 am: f5dbd73523"
|
2018-03-07 02:41:43 +00:00 |
|
Jaewan Kim
|
f45bfd9336
|
Merge changes from topic "session2-pi-listcallback" into pi-dev am: ccf41b87a9
am: f5dbd73523
Change-Id: Ic2612572d94d08c81777abf0a9f7100b0770f75e
|
2018-03-07 02:41:04 +00:00 |
|
TreeHugger Robot
|
f834155efc
|
Merge "fix slow get caps"
|
2018-03-07 02:40:59 +00:00 |
|
Rob Carr
|
b247dbdf41
|
Merge "Merge "Assign leash layer when starting animations." into pi-dev am: 540a2903cd" into pi-dev-plus-aosp
am: e82214025e
Change-Id: Ib0b3b8e65d4aa6a96294ed10a3cb16b4669177fc
|
2018-03-07 02:36:54 +00:00 |
|
Rubin Xu
|
9b6f4057fc
|
Merge "Merge "Move com.android.managedprovisioning package constant to config.xml" into pi-dev am: c26a909f63" into pi-dev-plus-aosp
am: 108783f584
Change-Id: Ie8d13ff71a269930c32d7ef203f50d52109a8ad3
|
2018-03-07 02:30:51 +00:00 |
|
Julia Reynolds
|
9a43b77aa8
|
Merge "Merge "Hide overlay notification" into pi-dev am: b88b9640cb" into pi-dev-plus-aosp
am: 8902278173
Change-Id: Iec80b861ab9fdec6cdf611532c68109092d6f293
|
2018-03-07 02:24:30 +00:00 |
|
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 |
|
Jaewan Kim
|
f5dbd73523
|
Merge changes from topic "session2-pi-listcallback" into pi-dev
am: ccf41b87a9
Change-Id: Icd9cf2075c57384300ab88f6c3170705caa6eb90
|
2018-03-07 01:21:03 +00:00 |
|
Android Build Merger (Role)
|
e82214025e
|
Merge "Merge "Assign leash layer when starting animations." into pi-dev am: 540a2903cd" into pi-dev-plus-aosp
|
2018-03-07 01:08:06 +00:00 |
|
Rob Carr
|
51c66dd603
|
Merge "Assign leash layer when starting animations." into pi-dev
am: 540a2903cd
Change-Id: Ic296e9aa0045eb69c80934ee6c3f28cf02c4204c
|
2018-03-07 01:07:46 +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)
|
108783f584
|
Merge "Merge "Move com.android.managedprovisioning package constant to config.xml" into pi-dev am: c26a909f63" into pi-dev-plus-aosp
|
2018-03-07 01:04:39 +00:00 |
|
Rubin Xu
|
3efafc4b19
|
Merge "Move com.android.managedprovisioning package constant to config.xml" into pi-dev
am: c26a909f63
Change-Id: Ia665fafd10cc5113c4e23828f592c4feefe5f567
|
2018-03-07 01:04:16 +00:00 |
|
Android Build Merger (Role)
|
8902278173
|
Merge "Merge "Hide overlay notification" into pi-dev am: b88b9640cb" into pi-dev-plus-aosp
|
2018-03-07 01:00:37 +00:00 |
|
Julia Reynolds
|
01259e758f
|
Merge "Hide overlay notification" into pi-dev
am: b88b9640cb
Change-Id: I4be82bf56d10ad56365153dc7c80faa6925a5eb4
|
2018-03-07 01:00:14 +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 |
|