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

200991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
af528c1ba0 Import translations. DO NOT MERGE 
Change-Id: I97060ccb99ccfa2cc1deb381b00500e4ff9661fd
Auto-generated-cl: translation import
 2015-06-15 07:28:03 -05:00
Jeff Sharkey
c0a6a3ef32 am a8e68812: am 315bca80: am 0463cad7: Maybe make strings happy? 
* commit 'a8e68812e6d64899fb3c45aef1248bad0d23a1dd':
  Maybe make strings happy?
 2015-06-15 04:44:50 +00:00
Jeff Sharkey
cd0b55201d am 330178fa: am e60ba0c7: am 52fc3c0f: Start using new storage strings. 
* commit '330178fa60aeceac74d942bdf1470794fe63eede':
  Start using new storage strings.
 2015-06-15 04:44:45 +00:00
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
f8d6ce6aab am 13fb3353: am 281c8389: am 6d977832: Merge "Remove bookmarks provider and associated permissions - framework" into mnc-dev 
* commit '13fb33535f93c8cd49650b398f5728938f90933b':
  Remove bookmarks provider and associated permissions - framework
 2015-06-14 20:34:52 +00: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
7dd20eb501 am ab47ce05: am d0fe86b5: am a5c852e0: Merge "Clear runtime permissions on package data reset." into mnc-dev 
* commit 'ab47ce059f806f282c565059a745f662c943d8e3':
  Clear runtime permissions on package data reset.
 2015-06-14 03:54:35 +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
d01f446085 am d85e7d06: am 174b86de: am 715cf2ac: Make AppOpsManager#permissionToOp API public 
* commit 'd85e7d06e0cb6b0cbafa53536ec9a817c1fa6068':
  Make AppOpsManager#permissionToOp API public
 2015-06-14 01:47:33 +00: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
2e3e39c44c am 428e0ec1: am ace5cd6f: am 31b9c172: Merge "UsbDeviceManager: Modify default function handling" into mnc-dev 
* commit '428e0ec16599c739c415935420b0a829dfe562bc':
  UsbDeviceManager: Modify default function handling
 2015-06-13 03:43:28 +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
847a22b0ba am fd8fd2a6: am e9228171: am 8da462de: Merge "Add path to native libraries inside apk" 
* commit 'fd8fd2a6155d9ff2be36e8c379d36d070bc33997':
  Add path to native libraries inside apk
 2015-06-13 02:42:31 +00:00
Chris Tate
cef452f458 am 52047ab1: am 386a5a29: am 396b83b0: Merge "Fix overflow/underflow problem in comparison" 
* commit '52047ab160629275f77d9dba6d69eb223986bdda':
  Fix overflow/underflow problem in comparison
 2015-06-13 02:42:25 +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
65031dc137 am c425e570: am b3957fbd: am 1035833f: Merge "Improve LockPatternView accessibility" into mnc-dev 
* commit 'c425e570141a6466ff81f36eb86cb91188c41c77':
  Improve LockPatternView accessibility
 2015-06-13 01:40:17 +00:00
Svetoslav
ee2de6bc59 am 659ef3c1: (-s ours) 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 '659ef3c10f69c6afb2a342789fff1e7135b9ab01':
  DO NOT MERGE Don't take flags when creating app widget config activity.
 2015-06-13 01:40:11 +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
Makoto Onuki
b3dcb74c69 am ed960080: am 5a9ef04f: am bd25b5f6: Merge "Fix ArrayIndexOutOfBoundsException in Transport.query" into mnc-dev 
* commit 'ed9600801733b3481a3ede9af94d2129620a348e':
  Fix ArrayIndexOutOfBoundsException in Transport.query
 2015-06-13 01:06:22 +00:00
Jorim Jaggi
e8a46197bc am ac31a0c6: am ae455573: am a8990422: Merge "Fix dark mode for custom views" into mnc-dev 
* commit 'ac31a0c60cc82eb98d3dd3f0ed36728409e13858':
  Fix dark mode for custom views
 2015-06-13 01:06:16 +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
a84fc38bdf am 92177ad7: am b3be7c26: am 80b34d7b: Merge "Add StorageEventListener.onDiskDestroyed()" into mnc-dev 
* commit '92177ad765b86f77e86a29e9d013883af9fec134':
  Add StorageEventListener.onDiskDestroyed()
 2015-06-13 00:29:45 +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