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

188078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Brubaker
03c13e430d am 93976df8: am 3a9779b6: am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth" 
* commit '93976df800641c9d56b73af6cb4bab9cc9a5f59e':
  Fix testSaw_ungrantedUid_Bluetooth
 2015-04-10 22:26:25 +00:00
Chad Brubaker
93976df800 am 3a9779b6: am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth" 
* commit '3a9779b6edf9b118d8907a8124cd53c05f72aa00':
  Fix testSaw_ungrantedUid_Bluetooth
 2015-04-10 22:17:00 +00:00
Shawn Willden
46bcfb64fb am c88e1396: am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable" 
* commit 'c88e1396db12e430dde63afc3d44c1f37a7fce79':
  Make several key crypto parameters repeatable
 2015-04-10 22:12:53 +00:00
Chad Brubaker
3a9779b6ed am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth" 
* commit '386c4e9ea976377d87950427472a593c22b1b205':
  Fix testSaw_ungrantedUid_Bluetooth
 2015-04-10 22:09:18 +00:00
Shawn Willden
c88e1396db am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable" 
* commit '99f4ac144506d307b38ab112d1054e5fe18a7217':
  Make several key crypto parameters repeatable
 2015-04-10 22:01:15 +00:00
Alan Viverette
9aac7f7038 Merge "Update rating bar assets for Material" 2015-04-10 21:56:27 +00:00
Shawn Willden
99f4ac1445 am 97fce66f: Merge "Make several key crypto parameters repeatable" 
* commit '97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f':
  Make several key crypto parameters repeatable
 2015-04-10 21:51:22 +00:00
Doris Liu
02ecf04097 Merge "Distance based animation duration" 2015-04-10 21:47:25 +00:00
Jorim Jaggi
e144bb15d0 Merge "Keyguard FP UX update" 2015-04-10 21:46:06 +00:00
Jorim Jaggi
3c84e2f2a1 Merge "Enable incremental SysUI builds on -eng targets" 2015-04-10 21:44:12 +00:00
Jorim Jaggi
27c9b74350 Keyguard FP UX update 
- Add scanning and error states to UI.
- Do not delay dismissing the panel when authenticating via
fingerprint.

Change-Id: I82e71c554c56e53ddf0677dca3e6909f7cedd59d
 2015-04-10 14:43:08 -07:00
Chad Brubaker
386c4e9ea9 Merge "Fix testSaw_ungrantedUid_Bluetooth" 2015-04-10 21:42:23 +00:00
Jorim Jaggi
3557e0ebee Enable incremental SysUI builds on -eng targets 
Ideally, we would also do incremental builds on userdebug targets,
but this introduces a risk that userdebug builds would be different
to user builds. So we only do it on eng builds for now.

Change-Id: I2778d270052cf26e6c767f1847991a425d8bbd12
 2015-04-10 14:41:17 -07:00
Adam Lesinski
eaa6a3fba8 Merge "Fix deadlock issue in BatteryStatsHelper." 2015-04-10 21:33:50 +00:00
Shawn Willden
97fce66f7d Merge "Make several key crypto parameters repeatable" 2015-04-10 21:21:37 +00:00
Chad Brubaker
6a5af8cf14 Fix testSaw_ungrantedUid_Bluetooth 
Keystore.saw returns [] on no result, not null, so the test was
incorrectly failing.

Change-Id: I22dcf85c5d6c5c0368848bc784c3215c092d9ea8
 2015-04-10 14:15:17 -07:00
Doris Liu
0084e37095 Distance based animation duration 
In order to preserve the same look and feel of an animation across different
devices, we need to maintain the same angular velocity for the animation in
users' field of view. Since the animation path may span different angles on
different devices, we need to therefore adjust the duration accordingly.

Change-Id: Ia37f213e5a894a046edbb1a45a4ced04e406d85d
 2015-04-10 14:09:30 -07:00
Jeff Tinker
2c611f146f Merge "Add a method to associate MediaDrm session with MediaCrypto" 2015-04-10 21:03:19 +00:00
Olawale Ogunwale
5033c1ef5b am 448cb9f9: am 6159f6eb: am 4406568e: Merge "Check caller status precisely when registering receiver." 
* commit '448cb9f9ee8c6bd0a53662362f4a71a1fa4bbd5b':
  Check caller status precisely when registering receiver.
 2015-04-10 21:01:22 +00:00
John Reck
041a9e5770 Merge "Remove user of GraphicsJNI::createBitmap" 2015-04-10 20:52:51 +00:00
ztenghui
4e1e6af476 Merge "The ValueAnimator's state need to be totally reset during clone." 2015-04-10 20:49:00 +00:00
Olawale Ogunwale
448cb9f9ee am 6159f6eb: am 4406568e: Merge "Check caller status precisely when registering receiver." 
* commit '6159f6eb231028bc6420edf4157fb335e78aca00':
  Check caller status precisely when registering receiver.
 2015-04-10 20:48:21 +00:00
Olawale Ogunwale
6159f6eb23 am 4406568e: Merge "Check caller status precisely when registering receiver." 
* commit '4406568ebac6f6bbf627aeb6909b409d948cecf4':
  Check caller status precisely when registering receiver.
 2015-04-10 20:37:00 +00:00
John Reck
4147877b38 Remove user of GraphicsJNI::createBitmap 
Change-Id: I2f31bf98ed08eb4bd39a6ce7236c7a23ef309177
 2015-04-10 13:35:27 -07:00
ztenghui
26e9a19900 The ValueAnimator's state need to be totally reset during clone. 
b/20119270

Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
 2015-04-10 13:33:13 -07:00
Adam Powell
08f90af803 Merge "Relax apilint FW1 error to a warning" 2015-04-10 20:23:36 +00:00
Adam Lesinski
1739076ef9 Fix deadlock issue in BatteryStatsHelper. 
It was assumed that BatteryStatsHelper could safely call into system services.
Because it is used when dumping information from the BatteryStatsService,
this assumption was incorrect.

Now the BatteryStats object carries around the state of the energy reporting
for Bluetooth and WiFi, so BatteryStatsHelper avoids a query into WiFiManager.

b/19729960

Change-Id: I8745cf6aafeea8e862e34fe63b20056f6ba54b40
 2015-04-10 13:17:47 -07:00
Olawale Ogunwale
4406568eba Merge "Check caller status precisely when registering receiver." 2015-04-10 20:14:54 +00:00
Chirag Shah
77d11ed69e Merge "Add support for schema.org actions in the assist data bundle." 2015-04-10 20:13:56 +00:00
Bryce Lee
662ed801ad am e0233e7e: am 73b56873: am eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled. 
* commit 'e0233e7e1162ce3e699d6eb6648e82d1b403e51e':
  Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
 2015-04-10 20:11:39 +00:00
Ronghua Wu
76ef9b07f7 Merge "media: add MediaFormat.KEY_OPERATING_RATE." 2015-04-10 20:10:04 +00:00
Adam Powell
539ea12810 Relax apilint FW1 error to a warning 
This rule was catching simple getters ("getIntent") as errors even if
the method is a true property get method. Relax to warning until we
can make this a bit more clever.

Change-Id: If183ad5bdc076ce2252399d4abcc8a3a6cbb55c3
 2015-04-10 13:07:52 -07:00
Bryce Lee
e0233e7e11 am 73b56873: am eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled. 
* commit '73b56873f1c39d29bc9f98e727b83b05bb74a44d':
  Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
 2015-04-10 20:02:01 +00:00
Jeff Brown
f42d493697 Merge "Tweak systrace for power manager." 2015-04-10 20:01:13 +00:00
Jeff Brown
faec22c8e1 Tweak systrace for power manager. 
Add name to photonic modulator thread.
Print light color in hex.

Change-Id: I813e875b04c381b26e0f79773a209417eca21e21
 2015-04-10 12:59:27 -07:00
Bryce Lee
73b56873f1 am eccaf729: Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled. 
* commit 'eccaf7290ab833d12049a184747603cd74261490':
  Allow going to home action to work for SHORT_PRESS_POWER_GO_HOME with keyguard enabled.
 2015-04-10 19:51:32 +00:00
Alan Viverette
682a433d0b Fix application of default dialog theme 
Cleans up lint annotations.

Bug: 20149703
Change-Id: I2ed4eb002b6679a55ea4d5fcc1ea958a4dcb08df
 2015-04-10 12:42:57 -07:00
Svetoslav
caa41648f4 Merge "Allow only system signed apps to grant permissions at install" 2015-04-10 18:45:07 +00:00
Svetoslav
805b63e253 Allow only system signed apps to grant permissions at install 
bug:20099946

Change-Id: Ifcc5c6638b4174ffb3ba452ae68a5a53b2d1ff0a
 2015-04-10 11:41:29 -07:00
Ashutosh Joshi
c5d8d88b12 Merge "Adding a feature string for high capability sensors." 2015-04-10 18:36:43 +00:00
Alex Klyubin
75f6f31db4 am d31d4771: am c5f9683c: am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'd31d4771d90277eb246814b6a6f981e0842eb614':
  Track more changes to keymaster_defs.h
 2015-04-10 18:29:53 +00:00
Chad Brubaker
59f977c698 Make several key crypto parameters repeatable 
Bug: 19509156
Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
 2015-04-10 12:20:04 -06:00
Alex Klyubin
d31d4771d9 am c5f9683c: am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'c5f9683c065e6ddf906a354603d19ce57448993f':
  Track more changes to keymaster_defs.h
 2015-04-10 18:18:42 +00:00
Alex Klyubin
c5f9683c06 am a270264c: Merge "Track more changes to keymaster_defs.h" 
* commit 'a270264c61daa42a5b03bbb1e7f23e77780f8fc0':
  Track more changes to keymaster_defs.h
 2015-04-10 18:09:27 +00:00
Alex Klyubin
a270264c61 Merge "Track more changes to keymaster_defs.h" 2015-04-10 17:51:49 +00:00
Alan Viverette
d18c59b3e6 Merge "Don't change state when inflating LayerDrawable" 2015-04-10 17:50:21 +00:00
Scott Kennedy
bb0acea215 Merge "Fix a typo in BluetoothLeScanner documentation" 2015-04-10 17:38:52 +00:00
Ben Kwa
23f5ca6dc8 Merge "Enable directory copying." 2015-04-10 17:33:44 +00:00
Nancy Chen
e42c9c7ff9 Merge "Create interface for SmsManager text sending methods." 2015-04-10 17:32:24 +00:00
Ben Kwa
726cf70fd4 Enable directory copying. 
- Enable directory picking for copying.
- Implement recursive copying inside the CopyService.
  - Pretty up the notification (use an indeterminate notification while
    calculating copy size)
  - Do two recursive walks: one to determine the size of the copy job,
    and then another to actually copy the files.
- Switch to using ContentProviderClient instances, for better error
  detection and handling
- Disable copying from the Recents view.

Change-Id: Ieb38cca80edf84a487547b68f0d6b328fc4d7701
 2015-04-10 10:28:22 -07:00