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

198860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
a8e68812e6 am 315bca80: am 0463cad7: Maybe make strings happy? 
* commit '315bca80118d92eb79710c97251185879c5b1dfd':
  Maybe make strings happy?
 2015-06-15 04:33:02 +00:00
Jeff Sharkey
330178fa60 am e60ba0c7: am 52fc3c0f: Start using new storage strings. 
* commit 'e60ba0c7fe970436ad70c0fe99b369b482b30fe1':
  Start using new storage strings.
 2015-06-15 04:32:58 +00:00
Jeff Sharkey
315bca8011 am 0463cad7: Maybe make strings happy? 
* commit '0463cad783e78381f390855d1cc9d7d8d803b634':
  Maybe make strings happy?
 2015-06-15 04:21:03 +00:00
Jeff Sharkey
e60ba0c7fe am 52fc3c0f: Start using new storage strings. 
* commit '52fc3c0f73a9081609c3636dd1b393a0653a9d00':
  Start using new storage strings.
 2015-06-15 04:20:59 +00:00
Jeff Sharkey
0463cad783 Maybe make strings happy? 
Bug: 21805255
Change-Id: I2e299a83b449aadc8e9a523fc4bbbf6f843f121d
 2015-06-14 21:18:10 -07:00
Jeff Sharkey
52fc3c0f73 Start using new storage strings. 
We have language for "unsupported" devices, and we're letting the
user snooze missing private volumes.

Bug: 21666225
Change-Id: I0bc17e6b854946036f02df5b4953b4344fa85a1f
 2015-06-14 20:58:57 -07:00
Svetoslav
13fb33535f am 281c8389: am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 
* commit '281c8389bcc50554496d525124338b1f7264525f':
  Remove bookmarks provider and associated permissions - framework
 2015-06-14 20:23:44 +00:00
Svetoslav
281c8389bc am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 
* commit '6d9778328a3c3c9da525870fff606af8ac5e9529':
  Remove bookmarks provider and associated permissions - framework
 2015-06-14 20:12:03 +00:00
Svetoslav
6d9778328a Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 2015-06-14 20:01:02 +00:00
Svet Ganov
ab47ce059f am d0fe86b5: am a5c852e0: Merge "Clear runtime permissions on package data reset." into mnc-dev 
* commit 'd0fe86b590af4167369a7c1857d758a6378679ca':
  Clear runtime permissions on package data reset.
 2015-06-14 03:43:00 +00:00
Svet Ganov
d0fe86b590 am a5c852e0: Merge "Clear runtime permissions on package data reset." into mnc-dev 
* commit 'a5c852e03abb9372a6928271a930d7d79e4ec45e':
  Clear runtime permissions on package data reset.
 2015-06-14 03:31:45 +00:00
Svet Ganov
a5c852e03a Merge "Clear runtime permissions on package data reset." into mnc-dev 2015-06-14 03:22:09 +00:00
Svet Ganov
2a30be1900 Clear runtime permissions on package data reset. 
bug:21817488

Change-Id: I7c51fee5206e3bcb79951f237a71862f0752a709
 2015-06-13 20:20:18 -07:00
Svet Ganov
d85e7d06e0 am 174b86de: am 715cf2ac: Make AppOpsManager#permissionToOp API public 
* commit '174b86dede42cf63c99d16f32f312069e9c74634':
  Make AppOpsManager#permissionToOp API public
 2015-06-14 01:36:18 +00:00
Svet Ganov
174b86dede am 715cf2ac: Make AppOpsManager#permissionToOp API public 
* commit '715cf2ac0bcd44720096cc91709b690b4828f0df':
  Make AppOpsManager#permissionToOp API public
 2015-06-14 01:23:53 +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
428e0ec165 am ace5cd6f: am 31b9c172: Merge "UsbDeviceManager: Modify default function handling" into mnc-dev 
* commit 'ace5cd6f5a0af6268739f2dc9eb5f788fb3ea011':
  UsbDeviceManager: Modify default function handling
 2015-06-13 03:31:25 +00:00
Nick Kralevich
ace5cd6f5a am 31b9c172: Merge "UsbDeviceManager: Modify default function handling" into mnc-dev 
* commit '31b9c1721f817600238476cb8eb495e6ed629960':
  UsbDeviceManager: Modify default function handling
 2015-06-13 03:19:41 +00:00
Nick Kralevich
31b9c1721f Merge "UsbDeviceManager: Modify default function handling" into mnc-dev 2015-06-13 03:12:49 +00:00
Dmitriy Ivanov
fd8fd2a615 am e9228171: am 8da462de: Merge "Add path to native libraries inside apk" 
* commit 'e92281716aa217c84b85c2f02b4e6175cde8c250':
  Add path to native libraries inside apk
 2015-06-13 02:25:59 +00:00
Chris Tate
52047ab160 am 386a5a29: am 396b83b0: Merge "Fix overflow/underflow problem in comparison" 
* commit '386a5a2940acd346f1d9e81c87dfa87e7d146065':
  Fix overflow/underflow problem in comparison
 2015-06-13 02:25:25 +00:00
Jim Miller
c425e57014 am b3957fbd: am 1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev 
* commit 'b3957fbd9b7f12881a781529fb957aebba752feb':
  Improve LockPatternView accessibility
 2015-06-13 01:29:01 +00:00
Svetoslav
659ef3c10f am a6d4213c: 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 'a6d4213c764a05cacddec689ffb2a02141abb9ae':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-13 01:28:56 +00:00
Jim Miller
b3957fbd9b am 1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev 
* commit '1035833fc6bcbd970807720926d8b93957775dbe':
  Improve LockPatternView accessibility
 2015-06-13 01:17:48 +00:00
Svetoslav
a6d4213c76 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:17:44 +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
Dmitriy Ivanov
e92281716a am 8da462de: Merge "Add path to native libraries inside apk" 
* commit '8da462dea50dda16ea83b8cad83412a76f60f915':
  Add path to native libraries inside apk
 2015-06-13 00:57:08 +00:00
Makoto Onuki
ed96008017 am 5a9ef04f: am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 
* commit '5a9ef04f032933ddc45611ff598f74273d9bccda':
  Fix ArrayIndexOutOfBoundsException in Transport.query
 2015-06-13 00:53:55 +00:00
Jorim Jaggi
ac31a0c60c am ae455573: am a8990422: Merge "Fix dark mode for custom views" into mnc-dev 
* commit 'ae45557394c10d8e16ebd38ecfa1b0576375643d':
  Fix dark mode for custom views
 2015-06-13 00:53:51 +00:00
Dmitriy Ivanov
8da462dea5 Merge "Add path to native libraries inside apk" 2015-06-13 00:44:01 +00:00
Makoto Onuki
5a9ef04f03 am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 
* commit 'bd25b5f6021295932a8ce2a6fa534dc37dacf249':
  Fix ArrayIndexOutOfBoundsException in Transport.query
 2015-06-13 00:35:26 +00:00
Jorim Jaggi
ae45557394 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:22 +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
92177ad765 am b3be7c26: am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit 'b3be7c26977ecebd9efd899ae5ef39e0552785aa':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:16:16 +00:00
Makoto Onuki
b3be7c2697 am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit '80b34d7b9da0e0738a4a1db78d83cd804372594b':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:05:03 +00:00
Amith Yamasani
34365d3571 am c4422b05: am 480d6eb9: Merge "Fix negative inactiveTime on creating a new user" into mnc-dev 
* commit 'c4422b05c2552b3f8712ee1d2a6e00b48beb693a':
  Fix negative inactiveTime on creating a new user
 2015-06-12 23:57:29 +00:00
Ruben Brunk
03d4cdec71 am 38998eaf: am 8491d2de: Merge "Fix rounding width." into mnc-dev 
* commit '38998eaf6c6e27d2155c24aab895baa93af775a7':
  Fix rounding width.
 2015-06-12 23:57:25 +00:00
Makoto Onuki
80b34d7b9d Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 2015-06-12 23:56:10 +00:00
Amith Yamasani
c4422b05c2 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:54 +00:00
Ruben Brunk
38998eaf6c am 8491d2de: Merge "Fix rounding width." into mnc-dev 
* commit '8491d2dea90bf462b09befb604138a77d746f94a':
  Fix rounding width.
 2015-06-12 23:45:49 +00:00
Adam Lesinski
f667a062e9 am 30ad8de5: am cd9d7b7b: Merge "App Standby: Convert constants to Settings.Global" into mnc-dev 
* commit '30ad8de51fd6f03b4fd92dd4957e3a3ff0bc6e84':
  App Standby: Convert constants to Settings.Global
 2015-06-12 23:39:30 +00:00
Jeff Sharkey
ed54749669 am e4872995: am 1d04e6a6: Merge "More useful extras in disk/volume broadcasts." into mnc-dev 
* commit 'e4872995224bca8371188d1b07e58871cc2aed7b':
  More useful extras in disk/volume broadcasts.
 2015-06-12 23:39:25 +00:00
Adam Lesinski
f038059208 am c32eec37: am 87a79c39: Merge "BatteryStatsHelper: Fix some lost power" into mnc-dev 
* commit 'c32eec37908a4d45c82bc4984fd9b68cb25949a8':
  BatteryStatsHelper: Fix some lost power
 2015-06-12 23:39:21 +00:00
Adam Lesinski
9f9541e992 am bc91d594: am a109cc1b: Merge "BatteryStats: Wifi energy data is sometimes wrong" into mnc-dev 
* commit 'bc91d5946afcff999de5d5f72c673e6c95ebee67':
  BatteryStats: Wifi energy data is sometimes wrong
 2015-06-12 23:39:16 +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