Adrian Roos
8fdf26ecfb
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-mr1-dev am: bd43552975 am: 24eaf0c700
...
am: 7dd485d858
2016-08-23 22:33:04 +00:00
Adrian Roos
eface9009a
Ambient: Pulse for every noisy notification exactly once am: d13602f1e7 am: e43dd10cbe
...
am: 828468d1c5
2016-08-23 22:32:53 +00:00
Scott Main
c694c49ce1
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f am: f8a0cb2964 am: 0ea21992e7 am: 97a3ed97c5
...
am: a0f8457aa7
2016-08-23 22:32:47 +00:00
smain@google.com
0bbc014ed7
add workaround for annotations dependency conflict with espresso am: eee3518d11 am: 349edcf169 am: da2802d1f9 am: 3e133f7e78
...
am: 50a7f9c169
2016-08-23 22:29:31 +00:00
Robin Lee
3fa72ffa62
Merge "Documentation warning against short-lived Contexts" into nyc-mr1-dev am: a1e4149cfd am: 39993c3b9d
...
am: d92c70ffd3
2016-08-23 22:29:24 +00:00
Robin Lee
765a12d0a2
Documentation warning against short-lived Contexts am: da23618043 am: c378aabdda
...
am: bb1619f795
2016-08-23 22:29:20 +00:00
Rubin Xu
8910bf2ca0
Merge "Handle null packageName in PendingIntentRecord" into nyc-mr1-dev am: 6acd5e7361 am: 2f6eecbed0
...
am: f38514ccd6
2016-08-23 22:29:15 +00:00
Rubin Xu
4bb1cc1fac
Handle null packageName in PendingIntentRecord am: 5bf8a33aaf am: 34474e5275
...
am: 7826b37259
2016-08-23 22:29:09 +00:00
Rubin Xu
3c38b4eed3
Handle null packageName in PendingIntentRecord am: 5bf8a33aaf am: 34474e5275
...
am: 2df8aac7e3
2016-08-23 22:22:46 +00:00
Rubin Xu
1227854957
Merge "Not longer need MANAGE_DEVICE_ADMINS permission." into nyc-mr1-dev am: a96e906e80 am: bcd1637096
...
am: a93643b056
2016-08-23 22:22:37 +00:00
Julius D'souza
31cea66171
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am: 3275a3a5a5 -s ours am: d5bf4039a9 -s ours am: b2507eb7b7 -s ours am: 7914092ded -s ours
...
am: ee8a92b7ca
2016-08-23 22:22:32 +00:00
Rubin Xu
9bbd86a8bb
Not longer need MANAGE_DEVICE_ADMINS permission. am: 1573d8be78 am: e815c696c0
...
am: 7ab392bfdb
2016-08-23 22:20:34 +00:00
Robin Lee
1f821a6c45
Merge "Force application context for KeyChain bindings" into nyc-mr1-dev am: cabc4f5945 am: 7a64f6cbfd
...
am: 8e8eefe683
2016-08-23 22:19:38 +00:00
TreeHugger Robot
ef588d02b7
Merge "resolve merge conflicts of 08afe2e to master"
2016-08-23 22:15:16 +00:00
TreeHugger Robot
b4385b1a9a
Merge "Improve logging for NightDisplayService/TwilightService"
2016-08-23 21:42:00 +00:00
TreeHugger Robot
eabb482ab8
Merge "Removed the POLICY_ALLOW_BACKGROUND_BATTERY_SAVE constant."
2016-08-23 21:18:26 +00:00
Robin Lee
269a840a0d
resolve merge conflicts of 08afe2e to master
...
Change-Id: Ia56802412340b7870171a9be1638b1131a8de076
2016-08-23 21:30:16 +01:00
Hongming Jin
ebae3b55b7
Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission."
2016-08-23 19:38:49 +00:00
Justin Klaassen
7fba392090
Improve logging for NightDisplayService/TwilightService
...
Bug: 31037341
Change-Id: Id6e5ea55f2fed93f1afdd0f61028e3329c8a43c3
2016-08-23 12:37:13 -07:00
TreeHugger Robot
ebc8367f22
Merge "Fixed test case that fails because of string order."
2016-08-23 19:36:26 +00:00
Felipe Leme
8546a44480
Removed the POLICY_ALLOW_BACKGROUND_BATTERY_SAVE constant.
...
That constant was created back in 2014 in the intial Battery Saver
implementation, but it's not used anymore (since the power saving
whitelist is fetched from DeviceIdleController).
Test: m -j32 FrameworksCoreTests && adb install -r -g
${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
&& adb shell am instrument -e class
"android.net.NetworkPolicyManagerTest" -w
"com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"
BUG: 28791717
Change-Id: Ic2c0bcb9736ce8b40e04fd644953e68241d06a69
2016-08-23 12:28:06 -07:00
TreeHugger Robot
0166811fad
Merge "Separate transaction direction for fragment transitions."
2016-08-23 19:23:02 +00:00
TreeHugger Robot
4f5503bc6a
Merge "Clarify FileObserver docs for null value."
2016-08-23 18:40:05 +00:00
Adrian Roos
90a654938c
HIC: Improve AccelerationClassifier am: 4dc14b231e am: 4a0f6aeb08 am: 87aa34746c
...
am: ae0337ca87
2016-08-23 18:35:01 +00:00
Lorenzo Colitti
0b95ba21c0
Refactor NetworkNotificationManager. am: 0b59906768 am: a6dcb89e6d am: 4e0916b416
...
am: 12eab8b34b
2016-08-23 18:34:58 +00:00
Lorenzo Colitti
2917d26662
Move notification code out of ConnectivityService. am: f3ae2eeae4 am: 622b5fbbf5 am: 28707247f4
...
am: d7f17adf27
2016-08-23 18:34:18 +00:00
Bill Yi
fe11411f6a
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4e3fe5c7d8 -s ours am: 3f8d11d863 -s ours
...
am: 6639280e93
2016-08-23 18:34:14 +00:00
Bill Yi
8a0d79ccf4
Import translations. DO NOT MERGE am: f2e311f117 -s ours am: 581dd8cfdd -s ours
...
am: 2b6d537648
2016-08-23 18:34:11 +00:00
Phil Weaver
017eecace1
Merge "Merge ag/1290921 to master."
2016-08-23 18:25:40 +00:00
Daichi Hirono
586fde2ea3
Merge "Set Root.FLAG_LOCAL_ONLY for MTP roots." into nyc-mr1-dev am: 5e252cecd1 am: 94d659ea6a
...
am: 9a51449f16
2016-08-23 18:16:26 +00:00
Daichi Hirono
5f467daedb
Set Root.FLAG_LOCAL_ONLY for MTP roots. am: b7573e93cd am: d590e3354d
...
am: e88dbc9dc8
2016-08-23 18:16:23 +00:00
Yang Ni
24601c87e7
Updated user document for Single-Source RenderScript am: c069ed7f8c am: 044cd35a46 am: 92b787bbf7 am: 606dcbd897
...
am: 333fdc8d00
2016-08-23 18:16:19 +00:00
Todd Kennedy
c6d6975ea0
Merge "No need to check package name" into nyc-mr1-dev am: 40db730b7f am: 875a96f5ac
...
am: 13b4a5cee2
2016-08-23 18:16:14 +00:00
Todd Kennedy
d64d0f9e83
No need to check package name am: afb5269ad6 am: b9de7e33a3
...
am: 8860c34b32
2016-08-23 18:16:08 +00:00
Android Build Merger (Role)
59e43d34e0
Merge changes from topic 'am-5c9b25aee118431ba7acdce08fecd280'
...
* changes:
Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev am: 0a376f56196af20d1c4ea6742e1c7af2ea177f8519551a8d8dc98c7e9da1ca1a630ccfbcc3c019d3
2016-08-23 18:12:05 +00:00
Android Build Merger (Role)
6b6fe62c9b
Merge changes from topic 'am-35af4edd646f40bab24ce58ec4876f71'
...
* changes:
Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev am: f6f4f1ac616afa73312c6b0a08359dc7136b3b3c9b2c0bf87e5a08c35738312eb78b4c6c902d04539d0879c6ac3d19454ec9e4af99d6b7
2016-08-23 18:11:28 +00:00
Android Build Merger (Role)
e987a07530
Merge "Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103" into nyc-mr1-dev am: b352d0a45a am: 2c9cfdf968 am: fcd4e8a4aa"
2016-08-23 18:10:54 +00:00
Fyodor Kupolov
8274dbec51
Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev am: 0a376f5619 am: 6af20d1c4e am: a6742e1c7a
...
am: f2ea177f85
2016-08-23 18:08:44 +00:00
Fyodor Kupolov
1dfcc09161
Added getDataPreloadsMediaDirectory am: 19551a8d8d am: c98c7e9da1 am: ca1a630ccf
...
am: bcc3c019d3
2016-08-23 18:08:03 +00:00
Jorim Jaggi
5cc93fd91b
Merge changes from topic 'am-c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev am: f6f4f1ac61 am: 6afa73312c
...
am: 6b0a08359d
2016-08-23 18:07:36 +00:00
Hongming Jin
368aa19040
Only return password for account session flow if the caller is signed
...
with system key and have get_password permission.
Bug: 30455516
Change-Id: I78484c59e4de1dff685ab91a0a8e7a756fffd9bf
2016-08-23 11:05:46 -07:00
Jorim Jaggi
3ceb4c6140
Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am: c7136b3b3c am: 9b2c0bf87e am: 5a08c35738
...
am: 312eb78b4c
2016-08-23 18:05:35 +00:00
Jorim Jaggi
6ace777436
Change retail mode wallpaper (1/2) am: 6c902d0453 am: 9d0879c6ac am: 3d19454ec9
...
am: e4af99d6b7
2016-08-23 18:04:57 +00:00
Adam Powell
cc7ec070a4
Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103" into nyc-mr1-dev am: b352d0a45a am: 2c9cfdf968
...
am: fcd4e8a4aa
2016-08-23 18:04:52 +00:00
Android Build Merger (Role)
bb4fc83ff0
Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am: 081e393103 am: 1b192da3fe am: abcc76610f am: 2fd24a8877"
2016-08-23 18:03:40 +00:00
Adrian Roos
7dd485d858
AppErrors: Don't suppress dialogs when ANR_SHOW_BACKGROUND is set am: 6a7e08920c
...
am: 5a461b65d0
2016-08-23 18:03:34 +00:00
Adrian Roos
828468d1c5
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-mr1-dev am: bd43552975
...
am: 24eaf0c700
2016-08-23 18:03:26 +00:00
Adrian Roos
a0f8457aa7
Ambient: Pulse for every noisy notification exactly once am: d13602f1e7
...
am: e43dd10cbe
2016-08-23 18:03:20 +00:00
Android Build Merger (Role)
9dc1aefeb5
Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N am: 64e1ba4398" into nyc-mr1-dev am: 998ff1c7be am: 79cb1d7a49 am: fb7134f9e9"
2016-08-23 18:03:17 +00:00
Scott Main
50a7f9c169
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f am: f8a0cb2964 am: 0ea21992e7
...
am: 97a3ed97c5
2016-08-23 18:03:13 +00:00
