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

198884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
fa0302bf13 am 9fed13f8: am 5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev 
* commit '9fed13f8c3be41d5039757fe44631b31780d89b6':
  Make references to ssid use a verbatim TtsSpan
 2015-06-15 14:39:07 +00:00
Jason Monk
9fed13f8c3 am 5d8c276b: Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev 
* commit '5d8c276bb91788441ec9a98717017eb01f1b348f':
  Make references to ssid use a verbatim TtsSpan
 2015-06-15 14:23:58 +00:00
Geoff Mendal
b736c65ab1 am ea1807aa: (-s ours) am 991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ea1807aa9d6829e4b8c07b82a349d1f15d37a503':
  Import translations. DO NOT MERGE
 2015-06-15 14:17:40 +00:00
Jason Monk
5d8c276bb9 Merge "Make references to ssid use a verbatim TtsSpan" into mnc-dev 2015-06-15 14:14:52 +00:00
Geoff Mendal
ea1807aa9d am 991f0f65: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '991f0f6549fd25a658f2519b4ee2169c6c5195eb':
  Import translations. DO NOT MERGE
 2015-06-15 14:09:04 +00:00
Jason Monk
6980d12c58 Make references to ssid use a verbatim TtsSpan 
Bug: 20059794
Change-Id: Id92ef11e78547e168f55515dea2fc28519871d6f
 2015-06-15 10:07:55 -04:00
Geoff Mendal
f5c84d5ca3 am f2cd1681: (-s ours) am 8cacde13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f2cd168186d6e96a345b7d6cd54e312f5536a1e0':
  Import translations. DO NOT MERGE
 2015-06-15 13:59:12 +00:00
Geoff Mendal
13eae7929f am 26df3646: (-s ours) am 1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '26df364618da36007186df8eb4c7a85e47f8e18a':
  Import translations. DO NOT MERGE
 2015-06-15 13:59:08 +00:00
Paul Jensen
b379fdd0e9 am 49ab026a: am 8a6025fd: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev 
* commit '49ab026a5298668681665212e0ea21f514e0642e':
  Remove most sleep() calls from ConnectivityServiceTest
 2015-06-15 13:59:04 +00:00
Geoff Mendal
f2cd168186 am 8cacde13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '8cacde138398bb63a131452fab84e3677b87adc3':
  Import translations. DO NOT MERGE
 2015-06-15 13:54:36 +00:00
Geoff Mendal
26df364618 am 1ed87e5d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1ed87e5d30b5ccfd1d7448f22389143928b8c118':
  Import translations. DO NOT MERGE
 2015-06-15 13:54:32 +00:00
Geoff Mendal
991f0f6549 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 13:53:11 +00:00
Geoff Mendal
1649b7895b Import translations. DO NOT MERGE 
Change-Id: I2b7fd1100aca78ce28f084bcf94637ba1975b21e
Auto-generated-cl: translation import
 2015-06-15 08:51:34 -05:00
Paul Jensen
49ab026a52 am 8a6025fd: Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev 
* commit '8a6025fdaf84ed6a9dbf1b21f48a931c90d4036e':
  Remove most sleep() calls from ConnectivityServiceTest
 2015-06-15 13:49:38 +00:00
Geoff Mendal
8cacde1383 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 13:45:48 +00:00
Geoff Mendal
1ed87e5d30 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-15 13:44:46 +00:00
Geoff Mendal
007c215917 Import translations. DO NOT MERGE 
Change-Id: Id021d13867abfcb10e4fb1a9754ae21052f66ffb
Auto-generated-cl: translation import
 2015-06-15 08:43:30 -05:00
Geoff Mendal
ee4a297766 Import translations. DO NOT MERGE 
Change-Id: I7bb1d35595971e4d2ff83ba40c01524ed243d26d
Auto-generated-cl: translation import
 2015-06-15 08:39:05 -05:00
Paul Jensen
8a6025fdaf Merge "Remove most sleep() calls from ConnectivityServiceTest" into mnc-dev 2015-06-15 13:35:48 +00:00
Chris Wren
de382ea589 am 09cd21be: am b3c85643: Merge "remove setLatestEventInfo from USB" into mnc-dev 
* commit '09cd21be4503347057acc6d643e6a59ae2bb5623':
  remove setLatestEventInfo from USB
 2015-06-15 12:48:23 +00:00
Chris Wren
09cd21be45 am b3c85643: Merge "remove setLatestEventInfo from USB" into mnc-dev 
* commit 'b3c8564314a4ce05b722e33409f2c15bcdac6666':
  remove setLatestEventInfo from USB
 2015-06-15 12:35:48 +00:00
Chris Wren
b3c8564314 Merge "remove setLatestEventInfo from USB" into mnc-dev 2015-06-15 12:23:26 +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
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