drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,948 Commits 1 Branch 0 Tags
Commit Graph

204948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Jang
63348ae457 am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 01:56:57 +00:00
Zach Jang
1b06455e44 am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 01:56:52 +00:00
Zach Jang
11317e82cf am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 01:44:58 +00:00
Zach Jang
00db082656 am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 01:44:53 +00:00
Zach Jang
32a420ea36 Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 2015-09-16 01:40:18 +00:00
Zach Jang
3ee9945be3 Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" 
This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
 2015-09-16 01:38:41 +00:00
Zach Jang
203b43547d Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 2015-09-16 01:37:36 +00:00
Lorenzo Colitti
5bc891c8a8 am 774adb03: am 7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev 
* commit '774adb03a30e0203bf2f4da29907d463799c33c3':
  Framework fixes for RSSI offload.
 2015-09-16 01:12:20 +00:00
Lorenzo Colitti
774adb03a3 am 7198c0aa: Merge "Framework fixes for RSSI offload." into mnc-dr-dev 
* commit '7198c0aa4ccbeaecf2606006d3a6ace684f805fe':
  Framework fixes for RSSI offload.
 2015-09-16 01:01:05 +00:00
Lorenzo Colitti
7198c0aa4c Merge "Framework fixes for RSSI offload." into mnc-dr-dev 2015-09-16 00:54:57 +00:00
Jim Miller
f84e0535ae am 0dd1163a: am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev 
* commit '0dd1163af00f16bc0e8e07cb585d4c217df78af3':
  Add logging to track fingerprint reco but not unlocking
 2015-09-15 21:31:22 +00:00
Guang Zhu
8bc9238f14 am 9e4a4606: am fe74fb95: extend svc command to control NFC state 
* commit '9e4a4606b8ff1469b7fee96ba1daa220fe51b042':
  extend svc command to control NFC state
 2015-09-15 21:31:16 +00:00
Svet Ganov
4f5b020e87 am 51491627: am 276da47a: am cd946024: Default grant SMS and Phone to the verifier 
* commit '51491627f4f191959ff34d4cff85171c1fc4cb8f':
  Default grant SMS and Phone to the verifier
 2015-09-15 21:31:09 +00:00
Christopher Tate
9cecf14783 Do not back up/restore the "pulse LED for notifications" setting 
Bug 24103790

Change-Id: I69a6a85e5282f9ca50fc2655bda4695757b92e74
 2015-09-15 14:26:12 -07:00
Filip Gruszczynski
8d5f358dce am 41e13b0a: Update circular mask after display is ready. 
* commit '41e13b0a68e49648d2f58738880bc3d6f93201cf':
  Update circular mask after display is ready.
 2015-09-15 21:24:15 +00:00
Jim Miller
0dd1163af0 am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev 
* commit 'dca3b2f74f7979e87e2654baf83df42483ef4388':
  Add logging to track fingerprint reco but not unlocking
 2015-09-15 21:22:50 +00:00
Guang Zhu
9e4a4606b8 am fe74fb95: extend svc command to control NFC state 
* commit 'fe74fb95b91a5d58a8d2d238c525e2f1891ca0c7':
  extend svc command to control NFC state
 2015-09-15 21:22:46 +00:00
Svet Ganov
51491627f4 am 276da47a: am cd946024: Default grant SMS and Phone to the verifier 
* commit '276da47adf23b5512985268f36fab0b7d2d11363':
  Default grant SMS and Phone to the verifier
 2015-09-15 21:22:41 +00:00
Jim Miller
dca3b2f74f Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev 2015-09-15 21:08:06 +00:00
Guang Zhu
fe74fb95b9 extend svc command to control NFC state 
Change-Id: I599e4000fa17384089410e63b3150f25aa9458f7
 2015-09-15 13:43:22 -07:00
Filip Gruszczynski
41e13b0a68 Update circular mask after display is ready. 
This fixes the situation where the circular mask is not applied because
the configuration is not reporting round screen. Configuration is
computed based on the display, so we can only depend on it having the
correct information after the display became ready.

Bug: 23689649
Bug: 23325855
Change-Id: I1e1fa307836f4053cfc4978da0239cb42c5af2c3
 2015-09-15 13:17:44 -07:00
Svet Ganov
276da47adf am cd946024: Default grant SMS and Phone to the verifier 
* commit 'cd946024e94a8fe2f4009dbd2e5463817a17b3a9':
  Default grant SMS and Phone to the verifier
 2015-09-15 20:10:30 +00:00
Zach Jang
3b49affdb3 Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s." 
This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
 2015-09-15 20:09:52 +00:00
Lorenzo Colitti
6bc0a2b6f8 Framework fixes for RSSI offload. 
1. When registering a NetworkCallback, only update RSSI
   thresholds if the request specifies a signal strength.
2. When releasing a NetworkCallback, only update RSSI
   thresholds if the request specified a signal strength.
3. Add logging.

Add logging.
Bug: 21405941
Bug: 23679346
Bug: 23815756
Change-Id: I4bc42d0ab02285a7a9d14e09f8a1cd868f4d9d7f
 2015-09-15 16:00:39 +09:00
Lorenzo Colitti
3bb69facad am 1d121b78: am e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev 
* commit '1d121b783324e86f1cd06fb3de91a35cacf3903f':
  NetworkDiagnostics: ping default router from all global addreses.
 2015-09-15 02:56:03 +00:00
Lorenzo Colitti
1d121b7833 am e1e97377: Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev 
* commit 'e1e97377d04ab6e5d069c85aba4226f47371e7c6':
  NetworkDiagnostics: ping default router from all global addreses.
 2015-09-15 02:46:36 +00:00
Lorenzo Colitti
e1e97377d0 Merge "NetworkDiagnostics: ping default router from all global addreses." into mnc-dr-dev 2015-09-15 02:39:20 +00:00
Jim Miller
1adb4a7693 Add logging to track fingerprint reco but not unlocking 
Bug 23940153

Change-Id: Idb01802ba68449370e8f3cbede0e2fe6d0b977ce
 2015-09-14 19:12:35 -07:00
Jack Yu
6af6c346ee Added a carrier config key for emergency messages on/off option always showing. 
Adding a carrier config key that allows carriers to show "Turn on Notifications"
checkbox in Settings->More->Emergency broadcasts setting menu. If this key
exists and is set to true, this checkbox will always show up regardless of
developer options turned on or not.

bug:23886750
Change-Id: I54dec5830653a0e27d7ee652effe572231f1e3bb
 2015-09-14 16:56:32 -07:00
Vinod Krishnan
aae9c4ab35 am 74c3a0e7: Merge "Add some constants for Wear MNC Perms" into cw-e-dev 
* commit '74c3a0e7b42e11ccd8f427660825bf6b3e3a4afc':
  Add some constants for Wear MNC Perms
 2015-09-14 22:31:46 +00:00
Vinod Krishnan
74c3a0e7b4 Merge "Add some constants for Wear MNC Perms" into cw-e-dev 2015-09-14 22:23:25 +00:00
Sridhar Vashist
c350430490 am 92a420eb: am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property. 
* commit '92a420eb184015f9bae2d189ef335f86af9cbcbb':
  DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
 2015-09-14 22:17:14 +00:00
Filip Gruszczynski
31f01e2f2a am 4cc1553c: am 0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied. 
* commit '4cc1553c931e26efad17cc1a1b74b0a0d880f301':
  Don't animate burn-in return when it wasn't applied.
 2015-09-14 22:17:08 +00:00
Sridhar Vashist
92a420eb18 am efc03355: (-s ours) DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property. 
* commit 'efc03355860359bb3edbb9573ba310f02742f416':
  DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property.
 2015-09-14 22:05:14 +00:00
Filip Gruszczynski
4cc1553c93 am 0b388d4a: (-s ours) Don\'t animate burn-in return when it wasn\'t applied. 
* commit '0b388d4a368e8503411450504c6e3d39952bce16':
  Don't animate burn-in return when it wasn't applied.
 2015-09-14 22:05:09 +00:00
Vinod Krishnan
61665cc4ae Add some constants for Wear MNC Perms 
- Add an API for getting list of apps that has runtime perms

Change-Id: I4ebfc01033ea96efaac062fd34982fbd0d081073
 2015-09-14 13:16:18 -07:00
Adrian Roos
9902b3bc8d am 699a5376: am 6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev 
* commit '699a5376c695b8e7570dfc83123fbfbfcba5da12':
  Fix light status bar transitions
 2015-09-14 19:03:06 +00:00
Adrian Roos
699a5376c6 am 6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev 
* commit '6b04e3a6ea042be0e012f7501fadb461b3d772a7':
  Fix light status bar transitions
 2015-09-14 18:54:28 +00:00
Adrian Roos
6b04e3a6ea Merge "Fix light status bar transitions" into mnc-dr-dev 2015-09-14 18:47:59 +00:00
Alexander Hills
693e11e56f am 6a261fd6: Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev 
* commit '6a261fd653eab7c8071290b71e3bfb3fe3598a49':
  Cherry-pick system theme rebase to fix square UI on round watches
 2015-09-14 18:39:35 +00:00
Alexander Hills
6a261fd653 Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev 2015-09-14 18:34:32 +00:00
Chris Manton
f40365f17a am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev 
* commit 'ae0b7ca9ad2e21853af06a68c02da068f748f8bd':
  Add capability to ignore carrier entitlement checks
 2015-09-14 17:39:31 +00:00
Chris Manton
ae0b7ca9ad am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev 
* commit 'c9180528452d67359618eda4aa2edd39112c83ca':
  Add capability to ignore carrier entitlement checks
 2015-09-14 17:29:09 +00:00
Chris Manton
c918052845 Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev 2015-09-14 17:23:42 +00:00
Alan Viverette
3d2337eeb5 Cherry-pick system theme rebase to fix square UI on round watches 
Our system themes were based on configurations that were added post-
init of the system theme.

I96e695441543379e4d5fdf3cc6f18d9e6cf953b4 broke this, because there
was a race condition in the code for rebasing themes

If8fecde76d62738a8e55eddf898eafc468afdba2 (the cherry-picked commit)
fixes the race condition and adds the rebasing back in.

This change cherry picks If8fecde76d62738a8e55eddf898eafc468afdba2.

Bug:23387146
Change-Id: I0725028e48599fc6cd9731ae16c71474dd5827e5
 2015-09-14 10:56:02 -04:00
Svet Ganov
cd946024e9 Default grant SMS and Phone to the verifier 
bug:24012164

Change-Id: I756644c8044076b2550d7ca104f542f50da0226b
 2015-09-12 10:20:08 -07:00
Michael Wright
521def98c0 am 4c330c6a: DO NOT MERGE. Truncate and ellipsize app name if too long for dialog. 
* commit '4c330c6ae53df48f6486b6f047021b204fc66594':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.
 2015-09-12 06:29:09 +00:00
Jorim Jaggi
12e273fe76 am f66e4979: am 84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager 
* commit 'f66e4979c579bde5031c8e6f29e5163246fc54ee':
  Dump Keyguard state in SystemUI and PhoneWindowManager
 2015-09-12 01:45:43 +00:00
Jorim Jaggi
f66e4979c5 am 84dc08a2: Dump Keyguard state in SystemUI and PhoneWindowManager 
* commit '84dc08a208eea7a4ddf043cadbb28987cf90ae22':
  Dump Keyguard state in SystemUI and PhoneWindowManager
 2015-09-12 01:34:26 +00:00
Jorim Jaggi
84dc08a208 Dump Keyguard state in SystemUI and PhoneWindowManager 
Bug: 23970549
Change-Id: Iec1e8ac507268086e0e2935847eda606ea1fb700
 2015-09-12 01:26:17 +00:00