Chris Tate
02ffbf039f
Merge "Correctly check expired jobs against active ones"
2017-03-18 00:39:59 +00:00
Brian Carlstrom
02a2813ad2
Merge "Warn when ActivityManagerService.dumpStackTraces times out"
2017-03-18 00:39:51 +00:00
Doris Ling
8edab274e0
Merge "Update battery settings summary text."
2017-03-18 00:39:09 +00:00
TreeHugger Robot
aa5be5d156
Merge changes Ic359aaee,Id7aba066
...
* changes:
AOD: Use color filter to invert icons for AOD
NotificationWrappers: Factor out doze treatment
2017-03-18 00:05:18 +00:00
TreeHugger Robot
a70288eea3
Merge changes Iab3f9914,I5d5da5e7
...
* changes:
Average scan results for AccessPoints.
Fix broken AccessPointTests.
2017-03-17 23:57:11 +00:00
fionaxu
fcd1493a6a
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am: 7f8d27f84b am: 4aadda1902
...
am: 606f1ae931
2017-03-17 23:50:47 +00:00
fionaxu
606f1ae931
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" am: 7f8d27f84b
...
am: 4aadda1902
2017-03-17 23:44:09 +00:00
fionaxu
4aadda1902
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"
...
am: 7f8d27f84b
2017-03-17 23:34:49 +00:00
TreeHugger Robot
dd1997bc9c
Merge "Getting ephemeral flag from PackageManager when UidRecord is null"
2017-03-17 23:25:19 +00:00
Treehugger Robot
7f8d27f84b
Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"
2017-03-17 23:24:29 +00:00
TreeHugger Robot
b234748565
Merge "format cleanup(intellij)"
2017-03-17 23:24:00 +00:00
Calin Juravle
072082d617
Merge "Compile secondary dex files according to REASON_BACKGROUND_DEXOPT"
2017-03-17 23:22:55 +00:00
Adam Lesinski
10eb1455b9
Merge changes from topic 'configForSplit'
...
* changes:
libandroidfw: Search all packages for an identifier
AAPT2: Finish support for feature splits
Add support for configForSplit
2017-03-17 23:19:13 +00:00
Android Build Merger (Role)
cdf3dc290b
Merge "Merge "Ota: Add command logging" am: 9a8d78dc86 am: 8dd991a7ef am: c47f92b374"
2017-03-17 23:12:05 +00:00
TreeHugger Robot
2903d13157
Merge "Better call emulation for DevicePolicyManagerTest"
2017-03-17 23:11:46 +00:00
Andreas Gampe
789a3e82cb
Merge "Ota: Add command logging" am: 9a8d78dc86 am: 8dd991a7ef
...
am: c47f92b374
2017-03-17 23:11:11 +00:00
Android Build Merger (Role)
a03686cc2e
Merge "Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f am: 07d79aa3b0 am: acd3953ea1"
2017-03-17 23:10:46 +00:00
Jakub Pawlowski
def6fee7f5
Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f am: 07d79aa3b0
...
am: acd3953ea1
2017-03-17 23:09:10 +00:00
TreeHugger Robot
a5ccbd9993
Merge "Fix ArrayMap.get vs ArrayMap.valueAt typo"
2017-03-17 23:07:31 +00:00
TreeHugger Robot
8c97bcc9fe
Merge "Show friction icons in Saved Networks list."
2017-03-17 23:06:15 +00:00
TreeHugger Robot
0843c57978
Merge "Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji"
2017-03-17 23:04:36 +00:00
Andreas Gampe
c47f92b374
Merge "Ota: Add command logging" am: 9a8d78dc86
...
am: 8dd991a7ef
2017-03-17 22:53:33 +00:00
TreeHugger Robot
935cd789f2
Merge "Update fontchain_lint.py to read Emoji 5.0 data"
2017-03-17 22:49:22 +00:00
Andreas Gampe
8dd991a7ef
Merge "Ota: Add command logging"
...
am: 9a8d78dc86
2017-03-17 22:45:34 +00:00
Jayachandran Chinnakkannu
e7cd345537
Merge "Add new precise call fail causes and OEM causes" am: 9aa841d254 am: 4992b1533e
...
am: a7c4fdbf03
2017-03-17 22:41:35 +00:00
Jakub Pawlowski
acd3953ea1
Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f
...
am: 07d79aa3b0
2017-03-17 22:41:00 +00:00
Treehugger Robot
9a8d78dc86
Merge "Ota: Add command logging"
2017-03-17 22:35:48 +00:00
Jakub Pawlowski
07d79aa3b0
Merge "Bluetooth 5 move timeout parameter (1/2)"
...
am: d9f2f67a5f
2017-03-17 22:34:24 +00:00
Jayachandran Chinnakkannu
a7c4fdbf03
Merge "Add new precise call fail causes and OEM causes" am: 9aa841d254
...
am: 4992b1533e
2017-03-17 22:34:01 +00:00
TreeHugger Robot
0b4cf0bf46
Merge "Update references to removed APIs"
2017-03-17 22:33:18 +00:00
Adrian Roos
cc95775297
AOD: Use color filter to invert icons for AOD
...
Fixes an issue where the AOD icons where of different
brightness because they were converted to grayscale and
then inverted. Now we just set the appropriate color filter
instead.
Change-Id: Ic359aaee2e19274670f44c5b7380c636ee26e559
Test: Open AOD, observe that the icons are colored solid white (like the clock) instead of gray.
Fixes: 35850204
2017-03-17 15:28:01 -07:00
Adrian Roos
edfb65bbc4
NotificationWrappers: Factor out doze treatment
...
Bug: 35850204
Test: receive a notification group, observe that the group icon is correctly inverted on ambient display.
Change-Id: Id7aba066eb1683705fdc2c008e657bd819ddd31d
2017-03-17 15:28:01 -07:00
Jayachandran Chinnakkannu
4992b1533e
Merge "Add new precise call fail causes and OEM causes"
...
am: 9aa841d254
2017-03-17 22:27:11 +00:00
Jakub Pawlowski
d9f2f67a5f
Merge "Bluetooth 5 move timeout parameter (1/2)"
2017-03-17 22:24:05 +00:00
Jakub Pawlowski
adbf2eef2f
Bluetooth 5 move timeout parameter (1/2)
...
Timeout is not a parameter, it is a property of enabling the
advertising. Move it into more proper place.
Test: manual
Bug: 30622771
Change-Id: I09ebc6c770bc02938ea16a9738a7e03dc8006fde
2017-03-17 22:23:57 +00:00
Peter Qiu
98595e7718
Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b am: 8951172562
...
am: 79ff52975f
2017-03-17 22:23:30 +00:00
Jayachandran Chinnakkannu
9aa841d254
Merge "Add new precise call fail causes and OEM causes"
2017-03-17 22:18:24 +00:00
Peter Qiu
79ff52975f
Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b
...
am: 8951172562
2017-03-17 22:16:22 +00:00
Peter Qiu
8951172562
Merge "hotspot2: implement toString for PasspointConfiguration"
...
am: 5bd337397b
2017-03-17 22:08:21 +00:00
Yohei Yukawa
2565a526a8
Merge "Deprecate IMM#showSoftInputUnchecked() part 1"
2017-03-17 22:05:21 +00:00
Treehugger Robot
5bd337397b
Merge "hotspot2: implement toString for PasspointConfiguration"
2017-03-17 21:57:16 +00:00
fionaxu
77a744c75e
remove deprecated SIM_ACTIVATION_REQUEST intent
...
This deprecated intent voilates intent naming conventions as defined in CDD.
Bug:35271104
Test: Manual
Change-Id: Ic7f251a6471de31e17960d612e108203983ce32d
2017-03-17 14:47:18 -07:00
TreeHugger Robot
a46d977849
Merge "Fix libplatformproto includes/export includes"
2017-03-17 21:46:12 +00:00
TreeHugger Robot
9e284db838
Merge "Make SYNC_PARENT_SOUNDS a @SystemApi"
2017-03-17 21:38:51 +00:00
Roozbeh Pournader
16a8f3762c
Remove U+1F93B MODERN PENATHLON and U+1F946 RIFLE from emoji
...
These had remained in Emoji.java although they were removed from Unicode
emoji. The data still needs to be updated to Emoji 5.0, but that will be
done in another CL.
Test: not needed
Bug: 28678294
Change-Id: I491c4bba107b960fb1efccbe19630ab274aa6e29
2017-03-17 14:38:46 -07:00
Doris Ling
92b2b3be10
Update battery settings summary text.
...
Bug: 36375846
Test: builds
Change-Id: I9d0cf831327960d69296de5b025e18c6f1f6a2ae
2017-03-17 14:37:24 -07:00
TreeHugger Robot
6c3489bc29
Merge "Code clean up: remove some dead code."
2017-03-17 21:35:02 +00:00
Suprabh Shukla
834b66c479
Getting ephemeral flag from PackageManager when UidRecord is null
...
When a user switches off background running for an app that was already
stopped, UidRecord is null when passed in to
AcitivityManager#doStopUidLocked resulting in an NPE. We need to get
ephemeral state flag from package manager in such cases.
Test: Manual
Bug: 36158380
Change-Id: Id77848c252cc0ff0c803113ac2c7c19aa0dcf254
2017-03-17 14:29:08 -07:00
Brian Carlstrom
7bdfe5cdd1
Warn when ActivityManagerService.dumpStackTraces times out
...
Test: Insert hang into art/runtime/signal_catcher.cc after "reacting to signal"
Bug: 35962833
Change-Id: Ia5444e7e23b3fc34f233ce8cc083d44b284a6cdc
2017-03-17 14:26:57 -07:00
Alan Viverette
44277fbd61
Merge "Allow the support library to add its own droiddoc options"
2017-03-17 21:02:03 +00:00
