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

201433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach Jang
0a8197b1e4 am 1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit '1cf21e443aaf207b962f50169be28c0babe71f61':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:04:23 +00:00
Bryce Lee
2f8ac2a35b Fix build due to merge of duplicate variable. 
Change-Id: I1e8bad32b2118542408b6d8b87302861e3873d32
 2015-09-16 20:06:46 -07:00
Tim Murray
a02f98239e am 952d5b33: Merge "Send power hint on fling gestures." into mnc-dr-dev 
* commit '952d5b334ccdf9cab0f56673861906e59d4e9933':
  Send power hint on fling gestures.
 2015-09-17 02:33:35 +00:00
Tim Murray
952d5b334c Merge "Send power hint on fling gestures." into mnc-dr-dev 2015-09-17 02:24:32 +00:00
Zach Jang
1cf21e443a DO NOT MERGE - Backport of ag/748165 to klp-dev 
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
 2015-09-17 01:20:27 +00:00
Zach Jang
bdf7f3583c DO NOT MERGE - Backport of ag/748165 to klp-dev 
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
 2015-09-17 01:17:58 +00:00
Michael Wright
a4d22d718a Send power hint on fling gestures. 
Use the existing PointerEventListener infrastructure to listen for
gestures that look like flings and hint to the power system when they
happen. Since we don't actually have a bound for the fling like a
regular application would, limit them to five seconds and refresh
every time a new fling is seen until the five second time period is
up.

bug 24059298

Change-Id: I5757a1e88f2ab2ef08cccefa8221d809ae71bb6f
 2015-09-17 00:18:13 +00:00
Jorim Jaggi
09999fb974 am 18f18ae0: Allow camera launch also when device is interactive 
* commit '18f18ae078ee97bbdfc9da39d4a19866dceb6a3e':
  Allow camera launch also when device is interactive
 2015-09-16 23:56:25 +00:00
Jorim Jaggi
18f18ae078 Allow camera launch also when device is interactive 
Bug: 23967648
Change-Id: If91df75e6325b3969dc2351a70af0c160d3eab04
 2015-09-16 23:44:56 +00:00
Yuchao Zhou
88daa997fc am c38ffecc: Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev 
* commit 'c38ffecc348687ae30c5fa2dc1761d9138b406b6':
  Moving BTtraffic from experiment location to here
 2015-09-16 22:53:10 +00:00
Yuchao Zhou
c38ffecc34 Merge "Moving BTtraffic from experiment location to here" into cw-d-mr1-dev 2015-09-16 22:42:34 +00:00
Yuchao Zhou
2de4b74d80 Moving BTtraffic from experiment location to here 
Change-Id: I1b0ec7fba87a098aa6509bd9be3f0e0ff624bf6e
 2015-09-16 15:37:40 -07:00
Adam Powell
4873c549f7 am 39e94ebe: Handle single-choice ChooserActivities and bound ChooserTargetServices 
* commit '39e94ebe22d4959facea4c3621a0a5377242a570':
  Handle single-choice ChooserActivities and bound ChooserTargetServices
 2015-09-16 21:02:58 +00:00
Fyodor Kupolov
d20f210650 am bfc584df: Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 
* commit 'bfc584df683a84dffd8e04b7b13f619606a0a42a':
  Use app directory as apkPath for cluster installs
 2015-09-16 21:02:53 +00:00
Jack Yu
717e39df1c am 870a9e6a: Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev 
* commit '870a9e6a783c7755b059d8533ae0232873bff9ba':
  Added a carrier config key for emergency messages on/off option always showing.
 2015-09-16 21:02:48 +00:00
Adam Powell
39e94ebe22 Handle single-choice ChooserActivities and bound ChooserTargetServices 
Fix cases where we could try to unbind from a ChooserTargetService
that is not connected. This could happen if we still had stale replies
coming back after the activity was destroyed.

Always offer users an explicit choice in ChooserActivity, don't
auto-start a single option.

Make sure we don't allow a wedged ChooserTargetService to hold a hard
reference to the ChooserActivity via its internal result callback.

Bug 23152483

Change-Id: I7c8b1fc9559dcd477702ef582011b088b07d646b
(cherry picked from commit 9761ab2a645a4643bd20619c7c148ef07e0dd39d)
 2015-09-16 19:54:24 +00:00
Fyodor Kupolov
bfc584df68 Merge "Use app directory as apkPath for cluster installs" into mnc-dr-dev 2015-09-16 19:37:47 +00:00
Jack Yu
870a9e6a78 Merge "Added a carrier config key for emergency messages on/off option always showing." into mnc-dr-dev 2015-09-16 19:15:49 +00:00
Chris Tate
ee16be69f1 am 3290f5dd: Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 
* commit '3290f5dd067557727f166ff7a51ad2b5209622f6':
  Do not back up/restore the "pulse LED for notifications" setting
 2015-09-16 17:11:19 +00:00
Chris Tate
3290f5dd06 Merge "Do not back up/restore the "pulse LED for notifications" setting" into mnc-dr-dev 2015-09-16 17:05:07 +00:00
Andres Morales
5b78fda91e am 38e6e4ef: Merge "reset lockout deadline on device reboot" into mnc-dr-dev 
* commit '38e6e4ef98ea1f116902725c282df9fb061a224e':
  reset lockout deadline on device reboot
 2015-09-16 16:12:03 +00:00
Andres Morales
38e6e4ef98 Merge "reset lockout deadline on device reboot" into mnc-dr-dev 2015-09-16 16:04:56 +00:00
Zach Jang
e1ab0999cd am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '2b564bf42a68370dc4d32acbb597cfb7c45f9f4f':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 02:25:32 +00:00
Zach Jang
eee9c2de43 am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '0098cbc011771d5ffdf93a3a4b7e6a0507e1725d':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 02:25:28 +00:00
Zach Jang
2b564bf42a am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '716c6269674474867dc4720f86f739c639c83400':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 02:16:04 +00:00
Zach Jang
0098cbc011 am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '971ff47c75889a2fc4ac710fbe62ba819feeaba6':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 02:16:00 +00:00
Zach Jang
716c626967 am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '63348ae4572cd9394e79fe343d2fca2b38498d1c':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 02:06:31 +00:00
Zach Jang
971ff47c75 am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '1b06455e44395489dcd027a170e68eabf2ebe1da':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 02:06:26 +00:00
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
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
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
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
Adrian Roos
e70e8ac938 DO NOT MERGE Send next alarm's show intent via PendingIntent 
Bug: 23909438
Change-Id: I0bb277c8385b7936fbda03cd76f02248c4fc55de
 2015-09-15 20:16:58 +00: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
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