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

169364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
057df69e83 am 8c2a8f64: am 0afd49a1: Merge "Add system API to get registered connection managers" into lmp-mr1-dev 
* commit '8c2a8f64b9c150b8e8422c5e97ca5d491b6fc93b':
  Add system API to get registered connection managers
 2014-11-25 17:38:32 +00:00
Jorim Jaggi
a6eaf8b38a am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 
* commit '82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d':
  Fix quick settings on Keyguard
 2014-11-25 17:38:26 +00:00
Chris Wren
dd8de0a7b6 am fa5768ce: am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 
* commit 'fa5768cef416d6379cd2a9e687695591add3f8b5':
  LED should not be blocked by interruption filtering.
 2014-11-25 17:38:21 +00:00
smain@google.com
cde2015889 am f00d46db: am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit 'f00d46db377b97da673f8699928d8343b3bc132d':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-25 17:38:15 +00:00
John Spurlock
98c2090de4 am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev 
* commit '98a20f68e0f31c43d090b16e3802c67226dbd055':
  QS: Update data usage over limit title.
 2014-11-25 17:38:02 +00:00
Paul Jensen
d5ffce76fb am 080b02fc: am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev 
* commit '080b02fc6c4531646d29ff4039080f2ac6d5f31a':
  Don't bother validating networks that don't satisfy the default request.
 2014-11-25 17:37:54 +00:00
Geoff Mendal
22af14587e am 5d50bf02: (-s ours) am 44b769d0: (-s ours) am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5d50bf02a6f34afd493e4d38f784790e08f6bd7e':
  Import translations. DO NOT MERGE
 2014-11-25 17:37:49 +00:00
Svet Ganov
f0de3a5ca3 am f34896bb: am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 
* commit 'f34896bbeb49aef3509e55ccf9afc7b62ae4dafd':
  Print spooler crash when printing after a rotation.
 2014-11-25 17:37:42 +00:00
Amit Mahajan
0e6d836efa am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit 'ed7ccb45c0ffe5de22af68904ddba4f515eb3f10':
  Set network selection to automatic when in Global mode
 2014-11-25 17:37:37 +00:00
John Reck
b7d40df088 am c68728f5: am b059ff81: am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
* commit 'c68728f5e97b0f354c00710f2359207d14ef784c':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
 2014-11-25 17:37:31 +00:00
Dianne Hackborn
14dd6ebff6 am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit 'd65cb22872b5dbfb5937d66191b60be22b63fd21':
  Final resource IDs.
 2014-11-25 17:36:58 +00:00
Dianne Hackborn
9fafd0c711 am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '608439df383b40dc0f808e4992b369debaff29cd':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:36:52 +00:00
Andres Morales
59093d925d Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 2014-11-25 17:35:21 +00:00
Bo Liu
3813430367 am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '84be180e97f920a9400789368a6bc54c5a9b90d8':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 16:59:27 +00:00
Bo Liu
84be180e97 Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 2014-11-25 16:56:07 +00:00
John Reck
f2a382d4f7 am fb6121e0: Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 
* commit 'fb6121e069f25dd43e15b1377fe4d5f60c3d0dbe':
  Revert "Ensure calling mutate() on DrawableContainer creates a new state"
 2014-11-25 15:59:27 +00:00
Andres Morales
6b0c7acd7f Define permission for system apps to query size of block 
Allows ManagedProvisioning to determine whether there's a
challenge and thus whether to disable NFC provisioning.

Other implementation option: new hidden boolean API method.
Can't think of benefit of new API method "isBlockInUse", other
than doesn't leak PDB size and is more explicitly tied to the
use case. Open to either impl if anyone has opinions on the matter.

Bug: 18508767
Change-Id: I28d2eb5a0837ff85cb91f140b17ce1dd843fe9d6
 2014-11-25 15:55:28 +00:00
John Reck
fb6121e069 Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 2014-11-25 15:54:25 +00:00
John Reck
cf84ab5e7f Revert "Ensure calling mutate() on DrawableContainer creates a new state" 
This reverts commit d7dab349c2af0e4bde188b1969f0c697b217dd57.

Change-Id: Icc1c4bfa296a59a551088fe7cc2449a97bb2b7b7
Reason: Broke the build
 2014-11-25 15:50:59 +00:00
John Reck
89a63f02f5 am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '0c31d97a38909e85e0df6cdc29469dbb1580ed4b':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 15:38:24 +00:00
John Reck
0c31d97a38 Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 2014-11-25 15:32:27 +00:00
Jeff Brown
b56c4263c7 am 8cac7309: am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '8cac73097e3695d22e3529e77048d82f7fa0fb1c':
  Make WallpaperService watch the actual display state.
 2014-11-25 15:10:26 +00:00
Sreeram Ramachandran
1cb0044ece am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '608ea322868385aaa46c20887795e72bf7068479':
  Delete unused/non-working code.
 2014-11-25 15:10:20 +00:00
Sreeram Ramachandran
19f47022e0 am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '4096a3107b070339ba06102a32a368f28a31f9a4':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:10:14 +00:00
Sreeram Ramachandran
ca7b070728 am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit '1d16570b374ffaea89a3e3d403146008d12e60b9':
  Eliminate race conditions in UID-based network filtering.
 2014-11-25 15:10:08 +00:00
Geoff Mendal
e86bc05ac6 am 1df8d4c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '1df8d4c5e09e0fc06d7c4a6d313e01906ea4d25e':
  Import translations. DO NOT MERGE
 2014-11-25 15:09:56 +00:00
Jorim Jaggi
649c0ca2a4 am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 
* commit 'fc4d8043ded6f8ef5dcf6ffdcb9f2f40c1c369f5':
  Tint SIM images in PIN/PUK screen
 2014-11-25 15:09:46 +00:00
Adrian Roos
e33017b404 am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 
* commit '20eb594ab27a9e4dee83574b3fe36a5a6d0d7807':
  Revert "Only keep user switcher bitmaps if needed"
 2014-11-25 15:09:39 +00:00
Adrian Roos
df3be538e0 am 9b4b2940: am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 
* commit '9b4b2940b7697e626200a7ab82fbfa3bf99174fc':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-25 15:09:33 +00:00
Adrian Roos
9a4d0257be am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
  Fix DPM.resetPassword("")
 2014-11-25 15:09:24 +00:00
Christoph Studer
fe6d4f094d am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '30646d87f240cd17917ad6d1ae83306d284b58b5':
  Fix MediaStyle API comments
 2014-11-25 15:09:18 +00:00
Chris Wren
ff47355d2b am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev 
* commit '865c73b5f66bfd1e5a9eded75b5a5fb24e701042':
  Push back notification means snooze the package.
 2014-11-25 15:09:12 +00:00
Geoff Mendal
bcd7a52ead am 41d3e943: (-s ours) am ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '41d3e943a7245c4a95095027a52224acef174758':
  Import translations. DO NOT MERGE
 2014-11-25 15:08:52 +00:00
Geoff Mendal
40ac65447b am c3ab889f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c3ab889f9eda2a6307cc7ef82a626ec66522472a':
  Import translations. DO NOT MERGE
 2014-11-25 15:08:46 +00:00
Geoff Mendal
b57d1ffe02 am c6a1070b: (-s ours) am 9be80ee5: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6a1070bd64bb7eb6cd13c6e3fdb0d33ab19d1f0':
  Import translations. DO NOT MERGE
 2014-11-25 15:08:39 +00:00
Zoltan Szatmary-Ban
3939d6abf2 am 8e55c4bf: am 604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev 
* commit '8e55c4bff83af7eea3212bc9ff6a254ac70139fd':
  Add new subcommand 'set-active-admin' to the dpm command.
 2014-11-25 15:08:08 +00:00
Jorim Jaggi
0da89b7640 resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
 2014-11-25 15:34:56 +01:00
Natalie Masse
a05d4a4bb3 am 8d9e6434: am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit '8d9e64343decaaf56a7d1fae5ed14ed172e9d7dd':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:27:32 +00:00
Natalie Masse
8d9e64343d am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit '65e51fcda25c33cdfa73e8ca3a4f71cf987bd0d2':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:22:05 +00:00
Natalie Masse
65e51fcda2 am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit 'd7c7d275e77ffcae7498df7f75142e68e1b5123c':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:15:24 +00:00
Natalie Masse
d7c7d275e7 am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 
* commit '77283ec981fc022cd26ced1e44ad21cdc0b2e4ae':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
 2014-11-25 11:10:09 +00:00
Natalie Masse
77283ec981 Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 2014-11-25 11:05:52 +00:00
Svet Ganov
48956f266d am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev 
* commit 'f51d7015df585b61d6a4f72f2327df7dcdec8899':
  Lockup in the print spooler.
 2014-11-25 10:42:30 +00:00
Svet Ganov
f51d7015df Merge "Lockup in the print spooler." into lmp-mr1-dev 2014-11-25 10:38:58 +00:00
Dirk Dougherty
be8da57a33 am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit '5977f7d52008f9b8dfc429acfde222a6e0afb2a2':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 03:03:46 +00:00
Dirk Dougherty
5977f7d520 am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'd23a8692ac96b7da73949d2dc4c549e73931609c':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 02:58:25 +00:00
Dirk Dougherty
d23a8692ac am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit '14e40f042f17ae9e596ba6db7ff11c230796f193':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 02:51:10 +00:00
Dirk Dougherty
14e40f042f am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'fd117ff2a4a8edd570ccaedd0cd769613ad4ef74':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 02:20:36 +00:00
Dirk Dougherty
fd117ff2a4 Doc change: zh-cn translation of Android L overviews. 
cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861

Change-Id: Ic02b747917b11a88c2adf38a73c046dc32af6ce9
 2014-11-24 17:39:14 -08:00
Alan Viverette
2bae3789da am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit 'ada19e6de6bbad9a11a8db6ee44eb923709153b5':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 00:56:15 +00:00