Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,834 Commits 3 Branches 0 Tags
1311933408a4e7ff2f282d4e4e7a0aada12e283e
Commit Graph

196834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svet Ganov
1311933408 am 715cf2ac: Make AppOpsManager#permissionToOp API public 
* commit '715cf2ac0bcd44720096cc91709b690b4828f0df':
  Make AppOpsManager#permissionToOp API public
 2015-06-14 01:25:43 +00:00
Svet Ganov
715cf2ac0b Make AppOpsManager#permissionToOp API public 
We need this API to implement permission checker API
in the support lib that takes into account both app
ops and permissions.

bug:21277214

Change-Id: I684fc002bb71ec5e1cd2994098faa0d2036297ac
 2015-06-14 00:50:38 +00:00
Nick Kralevich
0c686cca5e am 31b9c172: Merge "UsbDeviceManager: Modify default function handling" into mnc-dev 
* commit '31b9c1721f817600238476cb8eb495e6ed629960':
  UsbDeviceManager: Modify default function handling
 2015-06-13 03:19:25 +00:00
Nick Kralevich
31b9c1721f Merge "UsbDeviceManager: Modify default function handling" into mnc-dev 2015-06-13 03:12:49 +00:00
Jim Miller
dd23ad82f3 am 1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev 
* commit '1035833fc6bcbd970807720926d8b93957775dbe':
  Improve LockPatternView accessibility
 2015-06-13 01:16:54 +00:00
Svetoslav
0d745b119c am 911f0a1e: am 16c31a77: (-s ours) am 49717697: am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit '911f0a1e36b5f0a50c2dc1783c521070da2ba06b':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-13 01:16:50 +00:00
Jim Miller
1035833fc6 Merge "Improve LockPatternView accessibility" into mnc-dev 2015-06-13 01:10:21 +00:00
Svetoslav
911f0a1e36 am 16c31a77: (-s ours) am 49717697: am 34c7bd7c: am 74e04083: am 07264d93: am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating app widget config activity. 
* commit '16c31a77f75a30189a221043ad3ce73ca1610559':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-13 01:04:02 +00:00
Makoto Onuki
6a8cc98fa4 am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 
* commit 'bd25b5f6021295932a8ce2a6fa534dc37dacf249':
  Fix ArrayIndexOutOfBoundsException in Transport.query
 2015-06-13 00:35:54 +00:00
Jorim Jaggi
56e49993ea am a8990422: Merge "Fix dark mode for custom views" into mnc-dev 
* commit 'a89904223770a43d4c2e5ecd26400ed8f1db68df':
  Fix dark mode for custom views
 2015-06-13 00:35:49 +00:00
Makoto Onuki
bd25b5f602 Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 2015-06-13 00:28:20 +00:00
Jorim Jaggi
a899042237 Merge "Fix dark mode for custom views" into mnc-dev 2015-06-13 00:27:07 +00:00
Nick Kralevich
43965fe5ce UsbDeviceManager: Modify default function handling 
When adb is enabled, there's no need to also enable MTP mode.
ADB mode enabled is sufficient to get connect messages from
the kernel driver.

This change modifies getDefaultFunctions() to return adb mode
if adb is enabled, but mtp when it's not enabled. Also stop
using "none" mode as the default. "none" should only be used
when toggling the driver.

Bug: 21429947
Change-Id: I767491417c6c69a120fcf4f3d6ec0c73311a1a60
 2015-06-12 17:21:25 -07:00
Makoto Onuki
34bdcdb105 Fix ArrayIndexOutOfBoundsException in Transport.query 
The bug was that it used getCount() instead of getColumnCount().

Bug 21727804

Change-Id: I3ed6ed3be60c2cb25316340f588f993bac70f52b
 2015-06-12 17:16:23 -07:00
Makoto Onuki
e35e46acd6 am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit '80b34d7b9da0e0738a4a1db78d83cd804372594b':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:05:03 +00:00
Makoto Onuki
80b34d7b9d Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 2015-06-12 23:56:10 +00:00
Amith Yamasani
d0ab0fecee am 480d6eb9: Merge "Fix negative inactiveTime on creating a new user" into mnc-dev 
* commit '480d6eb953aa12a495a080557d4ea84782db2328':
  Fix negative inactiveTime on creating a new user
 2015-06-12 23:45:32 +00:00
Ruben Brunk
43918a1348 am 8491d2de: Merge "Fix rounding width." into mnc-dev 
* commit '8491d2dea90bf462b09befb604138a77d746f94a':
  Fix rounding width.
 2015-06-12 23:45:27 +00:00
Amith Yamasani
480d6eb953 Merge "Fix negative inactiveTime on creating a new user" into mnc-dev 2015-06-12 23:38:26 +00:00
Amith Yamasani
d82dbb3ffe Fix negative inactiveTime on creating a new user 
Initialize the beginIdleTime to 0 rather than current time.

Bug: 21699099
Change-Id: Ib94a9198c4e80aea5d9de68c5cf5d6f8cfc79e0a
 2015-06-12 16:35:17 -07:00
Ruben Brunk
8491d2dea9 Merge "Fix rounding width." into mnc-dev 2015-06-12 23:34:51 +00:00
Adam Lesinski
ea60230592 am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 
* commit 'cd9d7b7b076ff28bef5403b97754ae2853db17ee':
  App Standby: Convert constants to Settings.Global
 2015-06-12 23:31:35 +00:00
Jeff Sharkey
f39c53f220 am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev 
* commit '1d04e6a6cd06062483e22b387c6c1a615e4e5088':
  More useful extras in disk/volume broadcasts.
 2015-06-12 23:31:30 +00:00
Adam Lesinski
a32f9f7847 am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 
* commit '87a79c394dcecd28c3811615ce975abcde185255':
  BatteryStatsHelper: Fix some lost power
 2015-06-12 23:31:25 +00:00
Adam Lesinski
9c4298b036 am a109cc1b: Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev 
* commit 'a109cc1b6d08517ba0d9ee58bae65d3a6af739c1':
  BatteryStats: Wifi energy data is sometimes wrong
 2015-06-12 23:31:20 +00:00
Adam Lesinski
cd9d7b7b07 Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 2015-06-12 23:20:28 +00:00
Jeff Sharkey
1d04e6a6cd Merge "More useful extras in disk/volume broadcasts." into mnc-dev 2015-06-12 23:19:34 +00:00
Adam Lesinski
a6232df053 App Standby: Convert constants to Settings.Global 
Use settings instead of hardcoded constants, and listen for their changes.

Bug:21640379
Change-Id: Id8305bb234f93f7c64c1a5e82e26b31504624324
 2015-06-12 16:19:07 -07:00
Adam Lesinski
87a79c394d Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 2015-06-12 23:17:47 +00:00
Jeff Sharkey
c7acac6798 More useful extras in disk/volume broadcasts. 
Change-Id: I594166cff332aaf72b2b6357ac6ed3e6e42cbc49
 2015-06-12 16:16:56 -07:00
Ruben Brunk
68e4fc8ca9 Fix rounding width. 
Bug: 19930700
Change-Id: Ia2a1f85325e2c82e4d1ebe56aae696a207287cb7
 2015-06-12 16:16:42 -07:00
Adam Lesinski
a109cc1b6d Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev 2015-06-12 23:16:10 +00:00
Adam Lesinski
57123001a4 BatteryStatsHelper: Fix some lost power 
Looks like we were losing some power calculations from the CPU side of Bluetooth and
WiFi if there was no controller activity ocurring.

Also add finer breakdown of power to BatteryStats dumpsys for WiFi and Bluetooth.

Change-Id: Ic3ce3e4e3b854f17f9a32fd4bdc47a8ea74ca439
 2015-06-12 16:12:07 -07:00
Makoto Onuki
9dc575d63c Add StorageEventListener.onDiskDestroyed() 
Bug 21336042

Change-Id: I226cf205191dd302ff8d5156f9ae0fe8fc5b2c2b
 2015-06-12 16:11:46 -07:00
Chris Craik
e65d494325 am 4c9dafbf: Merge "Put WebViews with on a HW layer if stencil/shader clipping is needed" into mnc-dev 
* commit '4c9dafbfecf00ba3dca0c5de61d889676bfdc7af':
  Put WebViews with on a HW layer if stencil/shader clipping is needed
 2015-06-12 22:56:37 +00:00
Chris Craik
4c9dafbfec Merge "Put WebViews with on a HW layer if stencil/shader clipping is needed" into mnc-dev 2015-06-12 22:46:21 +00:00
dcashman
0045ebfe85 am 1a3048f3: Merge "Don\'t use upgrade-key-sets check when scanning during boot." into mnc-dev 
* commit '1a3048f3677680823b52d3b0d538917d08da8495':
  Don't use upgrade-key-sets check when scanning during boot.
 2015-06-12 22:33:03 +00:00
Ruben Brunk
531106c7a8 am e36829ee: Merge "Fix legacy disconnect callback." into mnc-dev 
* commit 'e36829ee00d178846cb95bebde41cc9204edcd76':
  Fix legacy disconnect callback.
 2015-06-12 22:32:59 +00:00
dcashman
1a3048f367 Merge "Don't use upgrade-key-sets check when scanning during boot." into mnc-dev 2015-06-12 22:22:00 +00:00
Ruben Brunk
e36829ee00 Merge "Fix legacy disconnect callback." into mnc-dev 2015-06-12 22:21:54 +00:00
Adam Lesinski
f4013aa4f7 BatteryStats: Wifi energy data is sometimes wrong 
Wifi energy data sometimes reports negative values. The bug
is filed, but in the meanwhile, batterystats calculations
are way off due to strange values.

Now we ignore invalid data, and sample again later.
Bug:21613534

Change-Id: I3c5c1385e15d85346e6fd3a2737cb58ca706ab74
 2015-06-12 15:18:06 -07:00
Paul McLean
a73925104b am 7d441225: Merge "Fixing no first "device added" notification." into mnc-dev 
* commit '7d4412255b3dc5625444f33f04abf57683351aad':
  Fixing no first "device added" notification.
 2015-06-12 22:17:45 +00:00
Paul McLean
7d4412255b Merge "Fixing no first "device added" notification." into mnc-dev 2015-06-12 22:07:49 +00:00
Stefan Kuhne
b739025e69 am 11e6fcb5: Merge "Removing screen artifacts afer orientation change in sleep mode" into mnc-dev 
* commit '11e6fcb5a8c031460cf2c2997ba0f807858bd37c':
  Removing screen artifacts afer orientation change in sleep mode
 2015-06-12 22:04:30 +00:00
Mike Lockwood
943aef225d am d5ca05c3: Merge "MidiDeviceServer: Fix race condition in setting device server\'s mDeviceInfo" into mnc-dev 
* commit 'd5ca05c3dd3c9cd2879b15ef2444c2c33824e01b':
  MidiDeviceServer: Fix race condition in setting device server's mDeviceInfo
 2015-06-12 22:04:26 +00:00
Adrian Roos
be44a62e48 am 6a25e400: Label work profile notification badge for a11y 
* commit '6a25e400cf927067421a784f58c1bf0f1a7c2cf1':
  Label work profile notification badge for a11y
 2015-06-12 22:04:14 +00:00
Paul McLean
cbeb8a2a3e Fixing no first "device added" notification. 
bug: 21674851

Change-Id: I3b2ed1cf00342471a5c70f2aecc832480d7e06fd
 2015-06-12 15:00:16 -07:00
Stefan Kuhne
11e6fcb5a8 Merge "Removing screen artifacts afer orientation change in sleep mode" into mnc-dev 2015-06-12 21:54:25 +00:00
Eric Laurent
5d54db1fdd am 7413ab67: Merge "audioservice: remove BT SCO device when service is disconnected" into mnc-dev 
* commit '7413ab673132c455663d6e4079fe5c2158b5046b':
  audioservice: remove BT SCO device when service is disconnected
 2015-06-12 21:51:51 +00:00
Jeff Sharkey
b2181aef48 am 8dd7ad74: Merge "Send along the disk ID that we just scanned." into mnc-dev 
* commit '8dd7ad7429d871baf60f371c51b89b0daef73396':
  Send along the disk ID that we just scanned.
 2015-06-12 21:51:43 +00:00