Commit Graph

361517 Commits

Author SHA1 Message Date
Andrew Sapperstein
00da81fe54 Merge "Merge "Update background ANR setting text" into pi-dev am: 948e1c502f" into pi-dev-plus-aosp
am: e632b53421

Change-Id: I2525f05928b622f55021522585c9b38a6651cfea
2018-03-07 04:57:05 +00:00
Pavlin Radoslavov
5fdd12ae2d Merge "Update the Bluetooth Active Device state in the Device Manager" am: 5b2fe53ab7 am: 7c7d28cdab -s ours
am: 244084dc24  -s ours

Change-Id: I25f3cc625016c69e0e2c2941b22aacfe87870b01
2018-03-07 04:50:30 +00:00
Tej Singh
20abbcfd20 Merge "Atom: ResourceConfigurationChanged" into pi-dev am: f9500e9c01
am: 5269c1d594

Change-Id: Ia5a2d023dfd9326589541c045d39cb0ad0ff355c
2018-03-07 04:46:34 +00:00
Chavi Weingarten
39563efc5d Merge "Fix wallpaper screenshot" into pi-dev am: 76439d832f
am: 7326a783c3

Change-Id: Ia5c2c45e22e56738962b311fdfcb1eabb9738836
2018-03-07 04:44:00 +00:00
Hall Liu
a879091c43 Merge "Fix Telecom dumpsys timestamps" am: c364ff38cb am: d6d07385a5
am: 7ef07b58b5

Change-Id: Ia2adc71d90804903b651bf8c6b428c45594c580d
2018-03-07 04:22:17 +00:00
Wyatt Riley
52c1611db0 Merge "Fix GnssMeasurement JNI for 1.1" into pi-dev am: 04f2800d53
am: e355da4101

Change-Id: Idecc767fe34ee532976dccd9564e51d56f4343cb
2018-03-07 04:00:12 +00:00
Android Build Merger (Role)
5f4e4a4864 Merge "Merge "IME API: rename IMS methods." into pi-dev am: 2b00eaed27 am: 327c666924" 2018-03-07 03:40:20 +00:00
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
TreeHugger Robot
916d55aa81 Merge "Improve a11y pane title javadoc" 2018-03-07 03:35:58 +00:00
Andrew Sapperstein
e6704d1498 Merge "Update strings that refer to the OS" into pi-dev am: c6d01893aa
am: f070a00cea

Change-Id: Iaf0bdb1e44057770efbfdf03778f5eb27b0256a8
2018-03-07 03:33:56 +00:00
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)
e632b53421 Merge "Merge "Update background ANR setting text" into pi-dev am: 948e1c502f" into pi-dev-plus-aosp 2018-03-07 02:53:00 +00:00
Andrew Sapperstein
bed2d6aa14 Merge "Update background ANR setting text" into pi-dev
am: 948e1c502f

Change-Id: Icd95b2ce4c3cbc102b14541c6b0fbf03b4c5faf2
2018-03-07 02:52:42 +00:00
Pavlin Radoslavov
244084dc24 Merge "Update the Bluetooth Active Device state in the Device Manager" am: 5b2fe53ab7
am: 7c7d28cdab  -s ours

Change-Id: I18ab5f14cdb57d73e09dfd7d27884221e80e40e3
2018-03-07 02:52:13 +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
Pavlin Radoslavov
7c7d28cdab Merge "Update the Bluetooth Active Device state in the Device Manager"
am: 5b2fe53ab7

Change-Id: I5928ddaea907e0beca598cdb4f1507a0930ea592
2018-03-07 02:41:19 +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
Tej Singh
5269c1d594 Merge "Atom: ResourceConfigurationChanged" into pi-dev
am: f9500e9c01

Change-Id: Ibcdf12e89320812306b8aa79751f20fea90e35b0
2018-03-07 02:39:11 +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
Chavi Weingarten
7326a783c3 Merge "Fix wallpaper screenshot" into pi-dev
am: 76439d832f

Change-Id: I210a59ff34c6136a683db5eee2080c297c8867ce
2018-03-07 02:30:31 +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
Hall Liu
7ef07b58b5 Merge "Fix Telecom dumpsys timestamps" am: c364ff38cb
am: d6d07385a5

Change-Id: Id973365c31e66c2afe885093495c6fc981bcd282
2018-03-07 02:07:11 +00:00
Hall Liu
d6d07385a5 Merge "Fix Telecom dumpsys timestamps"
am: c364ff38cb

Change-Id: Ife3272aa55bdbdc01971221017962b150106bdba
2018-03-07 01:52:15 +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
Wyatt Riley
e355da4101 Merge "Fix GnssMeasurement JNI for 1.1" into pi-dev
am: 04f2800d53

Change-Id: I671abacb6e65b7ece511653a677b3fcdc1adae49
2018-03-07 01:42:46 +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
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
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
Andrew Sapperstein
f070a00cea Merge "Update strings that refer to the OS" into pi-dev
am: c6d01893aa

Change-Id: I6d2964eaef46cd01806ed930988912258afa42ae
2018-03-07 01:25:07 +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
Phil Weaver
50d2808b95 Improve a11y pane title javadoc
Bug: 74123987
Test: Just changing comments.
Change-Id: I7f21947a35d1baccf171346979164718386c5b71
2018-03-06 17:23:01 -08: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
TreeHugger Robot
948e1c502f Merge "Update background ANR setting text" into pi-dev 2018-03-07 01:09:44 +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
Treehugger Robot
5b2fe53ab7 Merge "Update the Bluetooth Active Device state in the Device Manager" 2018-03-07 01:02:50 +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