Bill Yi
281ec7f3a7
Import translations. DO NOT MERGE
...
Change-Id: Icdf41966d67f7f46df746851bee6fb6c5d560e93
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-06 01:06:37 -07:00
Kai Wang
a8595bbfee
Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev am: bbf55bb7ae
...
am: 86baa82d01
2017-09-05 23:21:07 +00:00
Pankaj Kanwar
f3e4749b82
Merge "Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev am: e424d123ab am: 4a83143fd3" into oc-mr1-dev-plus-aosp
...
am: 75a75eb969
2017-09-05 22:52:49 +00:00
Pankaj Kanwar
e6bf99452c
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev am: e424d123ab am: ea24414654
...
am: 874616e6ab
2017-09-05 22:45:55 +00:00
Justin Klaassen
7715cc2b96
Merge "Fix A2dpProfileTest#getLabelDeviceConnectedWithHighQualityCodec" into oc-mr1-dev am: ae1dd84bf0
...
am: 691b715e77
2017-09-05 22:39:08 +00:00
Evan Laird
6767e7565a
Merge "Fix clipping on 3g icon" into oc-mr1-dev am: 3cd17ebd27
...
am: bfcc29ac3a
2017-09-05 22:33:47 +00:00
Adam Lesinski
920939fe31
Merge "AAPT2: Make sure to fail when XML linking fails" into oc-mr1-dev am: 1e22b33f34
...
am: 84be36e7b5
2017-09-05 22:28:09 +00:00
Jason Monk
e0870adbf1
Merge "resolve merge conflicts of bfe2580b24 to master"
2017-09-05 22:10:40 +00:00
Kai Wang
86baa82d01
Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev
...
am: bbf55bb7ae
2017-09-05 20:56:01 +00:00
Android Build Merger (Role)
75a75eb969
Merge "Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev am: e424d123ab am: 4a83143fd3" into oc-mr1-dev-plus-aosp
2017-09-05 20:52:51 +00:00
Pankaj Kanwar
874616e6ab
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev am: e424d123ab
...
am: ea24414654
2017-09-05 20:46:21 +00:00
Pankaj Kanwar
0afbeaf556
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev am: e424d123ab
...
am: 4a83143fd3
2017-09-05 20:46:18 +00:00
Kai Wang
bbf55bb7ae
Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev
2017-09-05 20:40:25 +00:00
Pankaj Kanwar
4a83143fd3
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev
...
am: e424d123ab
2017-09-05 20:34:35 +00:00
Pankaj Kanwar
ea24414654
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev
...
am: e424d123ab
2017-09-05 20:34:32 +00:00
Pankaj Kanwar
e424d123ab
Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev
2017-09-05 20:25:36 +00:00
TreeHugger Robot
5affd4f9b5
Merge "Fix issue #65298216 : DeviceIdleController needs to watch..."
2017-09-05 19:58:05 +00:00
Justin Klaassen
691b715e77
Merge "Fix A2dpProfileTest#getLabelDeviceConnectedWithHighQualityCodec" into oc-mr1-dev
...
am: ae1dd84bf0
2017-09-05 19:42:19 +00:00
Evan Laird
bfcc29ac3a
Merge "Fix clipping on 3g icon" into oc-mr1-dev
...
am: 3cd17ebd27
2017-09-05 19:30:56 +00:00
TreeHugger Robot
ae1dd84bf0
Merge "Fix A2dpProfileTest#getLabelDeviceConnectedWithHighQualityCodec" into oc-mr1-dev
2017-09-05 19:30:45 +00:00
TreeHugger Robot
3cd17ebd27
Merge "Fix clipping on 3g icon" into oc-mr1-dev
2017-09-05 19:21:42 +00:00
Adam Lesinski
84be36e7b5
Merge "AAPT2: Make sure to fail when XML linking fails" into oc-mr1-dev
...
am: 1e22b33f34
2017-09-05 18:59:39 +00:00
Jason Monk
ae3288229a
resolve merge conflicts of bfe2580b24 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I26ac9227556280df5fdc73a59265370fe859ecb1
2017-09-05 14:56:30 -04:00
Adam Lesinski
1e22b33f34
Merge "AAPT2: Make sure to fail when XML linking fails" into oc-mr1-dev
2017-09-05 18:53:44 +00:00
Jason Monk
bfe2580b24
Merge "Don't crash from null ServiceState in cdma" into oc-mr1-dev
...
am: 88aa3d0f3e
2017-09-05 18:38:42 +00:00
Jason Monk
88aa3d0f3e
Merge "Don't crash from null ServiceState in cdma" into oc-mr1-dev
2017-09-05 18:29:55 +00:00
Adrian Roos
55828dd06d
Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev am: b0d617a643
...
am: dc70defa05
2017-09-05 18:26:48 +00:00
TreeHugger Robot
c083f81cd0
Merge "Quiet keymap validation."
2017-09-05 18:16:54 +00:00
Adrian Roos
dc70defa05
Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev
...
am: b0d617a643
2017-09-05 18:16:17 +00:00
Adrian Roos
b0d617a643
Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev
2017-09-05 18:01:57 +00:00
Dianne Hackborn
3dba8cec35
Fix issue #65298216 : DeviceIdleController needs to watch...
...
...interactivity, not display state
Now it does.
Test: manual
Bug: 65298216
Change-Id: Iec15bff87c6eef43f60b706fa71954c983a4a1e8
2017-09-05 10:54:54 -07:00
Bryce Lee
9840ea9ab9
Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev am: 32b477db15
...
am: e6a5f1c9d6
2017-09-05 17:35:14 +00:00
Bryce Lee
e6a5f1c9d6
Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev
...
am: 32b477db15
2017-09-05 17:17:20 +00:00
Todd Kennedy
bdb4bc4fc0
Merge "Add internal implementation for notifyPackageUse" into oc-mr1-dev am: 8bb58a145c
...
am: ad64df2bac
2017-09-05 17:00:43 +00:00
TreeHugger Robot
32b477db15
Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev
2017-09-05 17:00:06 +00:00
Abodunrinwa Toki
7c5df649d7
Merge "Delete old TEXT_SELECTION_MENU_ITEM_ASSIST logs." into oc-mr1-dev am: f28b8a8de3
...
am: 48063322b4
2017-09-05 16:51:19 +00:00
Todd Kennedy
ad64df2bac
Merge "Add internal implementation for notifyPackageUse" into oc-mr1-dev
...
am: 8bb58a145c
2017-09-05 16:43:19 +00:00
Mathieu Chartier
7f4bfc3980
Merge "Move to using a profile for boot image" into oc-mr1-dev am: 4c1ad8fce4
...
am: b75b5b10b6
2017-09-05 16:36:27 +00:00
Abodunrinwa Toki
48063322b4
Merge "Delete old TEXT_SELECTION_MENU_ITEM_ASSIST logs." into oc-mr1-dev
...
am: f28b8a8de3
2017-09-05 16:35:07 +00:00
TreeHugger Robot
8bb58a145c
Merge "Add internal implementation for notifyPackageUse" into oc-mr1-dev
2017-09-05 16:28:13 +00:00
Mathieu Chartier
b75b5b10b6
Merge "Move to using a profile for boot image" into oc-mr1-dev
...
am: 4c1ad8fce4
2017-09-05 16:19:12 +00:00
Adrian Roos
27631fabde
Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev am: 14506c8806
...
am: 69ce71a11c
2017-09-05 16:17:05 +00:00
TreeHugger Robot
f28b8a8de3
Merge "Delete old TEXT_SELECTION_MENU_ITEM_ASSIST logs." into oc-mr1-dev
2017-09-05 16:14:13 +00:00
Adrian Roos
69ce71a11c
Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev
...
am: 14506c8806
2017-09-05 15:59:16 +00:00
Mathieu Chartier
4c1ad8fce4
Merge "Move to using a profile for boot image" into oc-mr1-dev
2017-09-05 15:55:52 +00:00
Adrian Roos
14506c8806
Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev
2017-09-05 15:39:17 +00:00
Jason Monk
e153198367
Don't crash from null ServiceState in cdma
...
Test: runtest systemui
Change-Id: Ib9813af4896d90878df970ef798f3f09e6522f3a
Fixes: 65224543
2017-09-05 11:20:30 -04:00
Evan Laird
2677805f35
Fix clipping on 3g icon
...
Viewport was a _little_ too small.
Test: visual; adb shell am broadcast -a "com.android.systemui.demo" -e
command network -e mobile show -e datatype 3g
Fixes: 64725694
Change-Id: I7e09bb8bb2a93ce6dc6670c175284d3927b007d7
2017-09-05 11:06:05 -04:00
Hugo Benichi
dc168546df
Merge "ConnectivityService: improve wakelock logging" am: d8f298365a am: 07f66ed517 am: 2cc55fb4f7 -s ours
...
am: 27805ce0b1
2017-09-05 14:56:11 +00:00
Hugo Benichi
27805ce0b1
Merge "ConnectivityService: improve wakelock logging" am: d8f298365a am: 07f66ed517
...
am: 2cc55fb4f7
2017-09-05 14:38:29 +00:00
