Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Chen
2fd19b6d52 Merge "Add meteredOverride field to WifiConfiguration." am: f9479fe639 am: dfd9942a31 
am: 99bd27f7ee

Change-Id: I07a9a25076807897399b5265cc19957f3f45d81c
 2016-12-01 03:34:59 +00:00
Stephen Chen
99bd27f7ee Merge "Add meteredOverride field to WifiConfiguration." am: f9479fe639 
am: dfd9942a31

Change-Id: Ia14b87efb46acf8ad8c4ad7921fdefdceb185f86
 2016-12-01 03:29:00 +00:00
Stephen Chen
dfd9942a31 Merge "Add meteredOverride field to WifiConfiguration." 
am: f9479fe639

Change-Id: I0d2540cf0a360f07c1dd103191fd348602099ff5
 2016-12-01 03:23:32 +00:00
Selim Cinek
5a41fe93da Fixed a bug where notifications were stale while collapsing 
An update to the icons wasn't applied if the shade was currently
collapsing.
We now ensure that the two states are always in sync.

Test: 1) download AndroidBvtTests.apk from data/app from build artefacts
2) adb install -g -r pathToAndroidBvtTests.apk
3) adb shell am instrument -w -e class com.android.androidbvt.SysUINotificationShadeTests#testBundledNotifications com.android.androidbvt/android.support.test.runner.AndroidJUnitRunner
Bug: 32437839

Change-Id: I26c097bdda251b4dfddb6dbf0deee74c30560873
 2016-12-01 03:22:02 +00:00
Bill Yi
2d1f3571fa Import translations. DO NOT MERGE 
Change-Id: I61bf134aeced89a0d2f6666bd2c8e4074f367234
Auto-generated-cl: translation import
 2016-11-30 19:21:09 -08:00
Andreas Gampe
6e2047ad27 Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd am: 0662cd5de8 am: 1c82020e2a 
am: 779f824a1b

Change-Id: I31c222f36404597eb66ddd8879285a34c3f3ce4b
 2016-12-01 03:14:38 +00:00
Andreas Gampe
779f824a1b Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd am: 0662cd5de8 
am: 1c82020e2a

Change-Id: I8c93bcf457c7bf7af78d13667922f908af7cb3d1
 2016-12-01 03:09:52 +00:00
Treehugger Robot
f9479fe639 Merge "Add meteredOverride field to WifiConfiguration." 2016-12-01 03:08:44 +00:00
Michael Kwan
ea612d4f99 Merge "Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 am: 522372ad23" into nyc-mr2-dev-plus-aosp 
am: 77cd18c069

Change-Id: Iea95ac28760341cc388f45b2a25066cfbb6632e4
 2016-12-01 03:07:16 +00:00
Michael Kwan
5d6ff01619 Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 am: 522372ad23 
am: 91f3b242ec

Change-Id: Iea9ccf765a29a2fcaf6ed0fcf42929458756252f
 2016-12-01 03:07:07 +00:00
Michael Kwan
0942a09c65 Merge "Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 am: f89f023fe9" into nyc-mr2-dev-plus-aosp 
am: d43f526e10

Change-Id: Iac97c96225e9a95fc09cfc298b69c171e925b3bb
 2016-12-01 03:05:41 +00:00
Michael Kwan
8620cd4b7e Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 am: f89f023fe9 
am: 329550fdb0

Change-Id: I2b9237270665c4f9f04d2583067e316ce788eb23
 2016-12-01 03:05:34 +00:00
Michael Kwan
dad7eb6e56 Merge "Change exit animation to use normal z-order. am: a562fe4a23 am: f1963fe340" into nyc-mr2-dev-plus-aosp 
am: 3624504854

Change-Id: I430d633d25e0e7d0d50d1794e48026f543f5a378
 2016-12-01 03:04:15 +00:00
Michael Kwan
2ca38db285 Change exit animation to use normal z-order. am: a562fe4a23 am: f1963fe340 
am: d344f82aef

Change-Id: Ia8b53d37aceac9248bdbe3cb4370f2481196e28f
 2016-12-01 03:04:06 +00:00
Michael Kwan
2bc71c7180 Change exit animation to use normal z-order. am: a562fe4a23 am: 8370c48c8d 
am: 901422ddb4

Change-Id: Ib5b2a24d1a5d2bd829270d010198fc497c40fc7b
 2016-12-01 03:03:01 +00:00
Android Build Merger (Role)
77cd18c069 Merge "Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 am: 522372ad23" into nyc-mr2-dev-plus-aosp 2016-12-01 02:59:49 +00:00
Android Build Merger (Role)
d43f526e10 Merge "Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 am: f89f023fe9" into nyc-mr2-dev-plus-aosp 2016-12-01 02:59:11 +00:00
Andreas Gampe
1c82020e2a Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd 
am: 0662cd5de8

Change-Id: I6df03a4573610d600a037b52635414bc600772e0
 2016-12-01 02:59:01 +00:00
Michael Kwan
91f3b242ec Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 
am: 522372ad23

Change-Id: Ibe8c6a63cbb99424bf11d30d340714d9e099a50f
 2016-12-01 02:58:59 +00:00
Android Build Merger (Role)
3624504854 Merge "Change exit animation to use normal z-order. am: a562fe4a23 am: f1963fe340" into nyc-mr2-dev-plus-aosp 2016-12-01 02:58:42 +00:00
Michael Kwan
329550fdb0 Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 
am: f89f023fe9

Change-Id: I8c800c48ebc7e82bd33ea4dc12261a389db27fad
 2016-12-01 02:58:40 +00:00
Michael Kwan
d344f82aef Change exit animation to use normal z-order. am: a562fe4a23 
am: f1963fe340

Change-Id: I53ae6e0e5735f20f5fe254d4d0380955be635b16
 2016-12-01 02:57:59 +00:00
Michael Kwan
901422ddb4 Change exit animation to use normal z-order. am: a562fe4a23 
am: 8370c48c8d

Change-Id: Ib250c8d2f8d205bdde970898f01aacdd41785d82
 2016-12-01 02:57:54 +00:00
Michael Kwan
f89f023fe9 Merge "Change exit animation to use normal z-order." into cw-f-dev 
am: 6abcefd350

Change-Id: I451251a4e1d579dfc10ab3ddaf4bdd5ee02e2372
 2016-12-01 02:53:10 +00:00
Michael Kwan
8370c48c8d Change exit animation to use normal z-order. 
am: a562fe4a23

Change-Id: Ib0ed1f600bb55e792eb31f28f275cd3717a9c454
 2016-12-01 02:53:04 +00:00
Michael Kwan
522372ad23 Merge "Change exit animation to use normal z-order." into cw-f-dev 
am: 6abcefd350

Change-Id: Ib5b10147cb8124adb44a1f46a4e6cc68085719a9
 2016-12-01 02:53:02 +00:00
Michael Kwan
f1963fe340 Change exit animation to use normal z-order. 
am: a562fe4a23

Change-Id: Ieacdc633ae77c445b091f8d8e56ff30733e8fb00
 2016-12-01 02:52:58 +00:00
Andreas Gampe
0662cd5de8 Merge "App_process: Merge app_process and app_process__asan" 
am: de32925ccd

Change-Id: I86aaea459fdc1283a3b7e2f0b035ad26aef98920
 2016-12-01 02:48:18 +00:00
TreeHugger Robot
86e50186b2 Merge "Start sensor service in a seperate thread" 2016-12-01 02:47:10 +00:00
TreeHugger Robot
6abcefd350 Merge "Change exit animation to use normal z-order." into cw-f-dev 2016-12-01 02:43:35 +00:00
Treehugger Robot
de32925ccd Merge "App_process: Merge app_process and app_process__asan" 2016-12-01 02:38:29 +00:00
Stephen Chen
8ca96c1f3c Add Settings.Global.WIFI_WAKEUP_ENABLED flag. 
Set the flag default to false. This addition is for the
Android Wi-Fi Snooze project:
https://docs.google.com/document/d/1zewDZ6Ne-qH7zKFDtcSx55f9jPauZwT5VvOs1uVNXf8/edit#

Bug: 32920000
Bug: 32913119
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java

Change-Id: I597d5dd643e8044315cc6d7553ae5740485a0552
 2016-11-30 18:31:44 -08:00
Amin Shaikh
fb0cd67264 Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1 am: a8fc97d2de am: d136025272 
am: f9f477454e

Change-Id: Ied1038387d5be28a4d723b71dc633ed035125c1b
 2016-12-01 02:31:36 +00:00
Amin Shaikh
f9f477454e Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1 am: a8fc97d2de 
am: d136025272

Change-Id: I2190eb09039d7abc51d4752c410d1d38e220564b
 2016-12-01 02:26:50 +00:00
TreeHugger Robot
b059a0826d Merge "Add API to visualize/debug/compare color spaces and colors" 2016-12-01 02:23:47 +00:00
Amin Shaikh
d136025272 Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1 
am: a8fc97d2de

Change-Id: I34ed2f31eaa1336990c941ee63eea0c1ddbc305c
 2016-12-01 02:21:03 +00:00
TreeHugger Robot
f6e6213b32 Merge "LightService: don't use implicit cast of Return<*>" 2016-12-01 02:11:30 +00:00
Amin Shaikh
a8fc97d2de Merge "Refactor NetworkScoreAppManager for testing." 
am: 3af97482f1

Change-Id: I99537b7841021704c162db6b8fe3d472ede1e991
 2016-12-01 02:10:55 +00:00
pengzhicai
acaed3d29e Fix the deadlock problem 
https://code.google.com/p/android/issues/detail?id=229020

Change-Id: Ib08f62dd916d09e666e58fb583555170d1e51da6
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
 2016-12-01 02:01:49 +00:00
Treehugger Robot
3af97482f1 Merge "Refactor NetworkScoreAppManager for testing." 2016-12-01 01:59:14 +00:00
Bill Yi
d3ddfe5c6b Import translations. DO NOT MERGE 
Change-Id: I81df81a998002ad4f95465dbfc371fcf0b7e52d7
Auto-generated-cl: translation import
 2016-11-30 17:57:34 -08:00
Mark Renouf
3a561b4bae Merge "Merge "Allow power button to close an input method" into cw-f-dev am: 33d498b946 am: 5544461b3e" into nyc-mr2-dev-plus-aosp 
am: efc08be017

Change-Id: I9cd9e6639ff5fb3593e59c6e2b33d93d836c9390
 2016-12-01 01:57:25 +00:00
Mark Renouf
7494278674 Merge "Allow power button to close an input method" into cw-f-dev am: 33d498b946 am: 5544461b3e 
am: ace8e696b9

Change-Id: I3b6b5ce77a38c2eb000dbd0588a0107e1a3c8490
 2016-12-01 01:57:15 +00:00
Mark Renouf
cfa1dde55e Merge "Allow power button to close an input method" into cw-f-dev am: 33d498b946 am: 85387e3357 
am: 808ece772b

Change-Id: Ic6e6a564d6998c5876a6855f4edbb436e6dcfad1
 2016-12-01 01:56:15 +00:00
Mark Renouf
ba1e9f84ef Merge "Allow power button to close an input method am: d28e907183 am: fed8c7dc73" into nyc-mr2-dev-plus-aosp 
am: 7477f8044b

Change-Id: I6054c0ca458a246dc6ce2b831ecee01b0f6975ce
 2016-12-01 01:55:20 +00:00
Mark Renouf
c127f7b5e6 Allow power button to close an input method am: d28e907183 am: fed8c7dc73 
am: cd0facd4ca

Change-Id: I9d354f4b245a2b3ba454ce605a7f2ab20c425d31
 2016-12-01 01:45:21 +00:00
Mark Renouf
86baea1e8a Merge "Allow power button to close an input method am: d28e907183 am: 8da4ced46c" into nyc-mr2-dev-plus-aosp 
am: ded25aed8e

Change-Id: I471b02827aa7b67b95e18a7958d372ac2e12c7f8
 2016-12-01 01:43:29 +00:00
Elliot Waite
fc175c08cb Change insecure HTTP resource link to scheme-relative link. 
Change-Id: Id3c0d448b7aa4cafd87cfa46408c62a6fb0f3e57
 2016-11-30 17:42:18 -08:00
Android Build Merger (Role)
efc08be017 Merge "Merge "Allow power button to close an input method" into cw-f-dev am: 33d498b946 am: 5544461b3e" into nyc-mr2-dev-plus-aosp 2016-12-01 01:42:09 +00:00
Mark Renouf
cf952e74b0 Allow power button to close an input method am: d28e907183 am: 8da4ced46c 
am: 9a21708ec6

Change-Id: I63d939d4dbd889cbd6f83ef101d817ccd561d707
 2016-12-01 01:41:56 +00:00