Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,568 Commits 3 Branches 0 Tags
fe968c40f6ffd04590aec0cdd62d12631f33bc21
Commit Graph

278568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
fe968c40f6 Merge "Get the correct operator name" into nyc-mr1-dev-plus-aosp 
am: e2e654f892

Change-Id: Idfd43e8be39479c67288e58c5045530cd5b97eaf
 2016-12-01 21:57:50 +00:00
Zoran Jovanovic
fc36f2f260 Get the correct operator name 
am: 67f579be19

Change-Id: Ia822adfdcfa47f7ec0b95cc44b48ab3a1bd75961
 2016-12-01 21:57:44 +00:00
ltrochtova
ecb5e3a665 Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92 -s ours am: 0a21ba22e3 
am: 6a3e0921fe

Change-Id: I6bfce1299a429a8cf3a42b2d265550a588f7f5d9
 2016-12-01 21:53:41 +00:00
Robert Greenwalt
e2e654f892 Merge "Get the correct operator name" into nyc-mr1-dev-plus-aosp 2016-12-01 21:46:51 +00:00
ltrochtova
6a3e0921fe Merge "Introduce a new user restriction for disallowing Bluetooth." am: 1e9a5eac92 -s ours 
am: 0a21ba22e3

Change-Id: I6460fb58be9ecac4bbd4f13ad61537704bd4a150
 2016-12-01 21:43:41 +00:00
ltrochtova
0a21ba22e3 Merge "Introduce a new user restriction for disallowing Bluetooth." 
am: 1e9a5eac92  -s ours

Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029
 2016-12-01 21:31:23 +00:00
Makoto Onuki
287fa3404c Merge "Fix issue with apps restored to lower versions." into nyc-mr2-dev 
am: 986d88d7fe

Change-Id: I2347429a663180a86e544c5ca9571fe8c6a57eda
 2016-12-01 20:57:07 +00:00
Makoto Onuki
affadd52af Fix issue with apps restored to lower versions. 
am: fac592f64c

Change-Id: I01601d1638a1ad23dcf2c57df75b81819ee3dce7
 2016-12-01 20:57:03 +00:00
Makoto Onuki
986d88d7fe Merge "Fix issue with apps restored to lower versions." into nyc-mr2-dev 2016-12-01 20:47:10 +00:00
Zoran Jovanovic
67f579be19 Get the correct operator name 
If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: ServiceStateTrackerTest.java exteneded in partner cl
Depends-On: commit in frameworks/opt/telephony with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
 2016-12-01 10:36:21 -08:00
Jorim Jaggi
4161a104b1 Fix deadzone in seascape orientation 
am: c8d6603644

Change-Id: Ic02394700b6fc6ea07f17f8ef39d7a4d50344422
 2016-12-01 14:02:40 +00:00
ltrochtova
1e9a5eac92 Merge "Introduce a new user restriction for disallowing Bluetooth." 2016-12-01 13:40:29 +00:00
Jorim Jaggi
c8d6603644 Fix deadzone in seascape orientation 
Test: Enable config_dead_zone_flash, make sure deadzone gets drawn
on the right side in seascape/landscape/portrait and deadzone is
consuming clicks on the right side.

Change-Id: Icc88967cfa7bf8ba7f6f3b797ca001eba78e5cdc
Fixes: 32870901
(cherry picked from commit 7aaa3d7d19)
 2016-12-01 12:24:27 +00:00
Lenka Trochtova
69f9d321ac Introduce a new user restriction for disallowing Bluetooth. 
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on
the  entire device - i.e. in all the users.

Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m  CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Change-Id: Iae77647b1e48be6b8efbeccdff6a3d468a0e174d
 2016-12-01 10:56:51 +01:00
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
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
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
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
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
Amin Shaikh
d136025272 Merge "Refactor NetworkScoreAppManager for testing." am: 3af97482f1 
am: a8fc97d2de

Change-Id: I34ed2f31eaa1336990c941ee63eea0c1ddbc305c
 2016-12-01 02:21:03 +00:00
Amin Shaikh
a8fc97d2de Merge "Refactor NetworkScoreAppManager for testing." 
am: 3af97482f1

Change-Id: I99537b7841021704c162db6b8fe3d472ede1e991
 2016-12-01 02:10:55 +00:00
Treehugger Robot
3af97482f1 Merge "Refactor NetworkScoreAppManager for testing." 2016-12-01 01:59:14 +00: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
ace8e696b9 Merge "Allow power button to close an input method" into cw-f-dev am: 33d498b946 
am: 5544461b3e

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

Change-Id: I8c45b6cb87fcee0ffe8ad5948b1b82ca16d39912
 2016-12-01 01:41:09 +00:00
Android Build Merger (Role)
7477f8044b Merge "Allow power button to close an input method am: d28e907183 am: fed8c7dc73" into nyc-mr2-dev-plus-aosp 2016-12-01 01:35:49 +00:00
Android Build Merger (Role)
ded25aed8e Merge "Allow power button to close an input method am: d28e907183 am: 8da4ced46c" into nyc-mr2-dev-plus-aosp 2016-12-01 01:35:24 +00:00
Mark Renouf
cd0facd4ca Allow power button to close an input method am: d28e907183 
am: fed8c7dc73

Change-Id: I6eeb7b1fc8dd3d551b4a36fde38f20148493338c
 2016-12-01 01:34:44 +00:00
Mark Renouf
9a21708ec6 Allow power button to close an input method am: d28e907183 
am: 8da4ced46c

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

Change-Id: I627188ee2622c30d8f65debe7c350c1c25309acf
 2016-12-01 01:34:22 +00:00
Mark Renouf
85387e3357 Merge "Allow power button to close an input method" into cw-f-dev 
am: 33d498b946

Change-Id: I16d09e41f6804d0f5bd68b02e019a2d258c792f3
 2016-12-01 01:34:15 +00:00
Doris Liu
00d348ec26 Fix LUTInterpolator lookup table position calc 
am: 0940834c8c

Change-Id: Ib80c00801473d7e60bae87b3b34a381c7f8e7e68
 2016-12-01 01:33:52 +00:00
Mark Renouf
fed8c7dc73 Allow power button to close an input method 
am: d28e907183

Change-Id: I26176ab20b90ca2c5d286b3f34bfacc6527018b5
 2016-12-01 01:29:31 +00:00
Mark Renouf
8da4ced46c Allow power button to close an input method 
am: d28e907183

Change-Id: I0324d14bde85e3461d0fe605f3b83496b25b9c75
 2016-12-01 01:29:11 +00:00