Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 d7dab349c2.

Change-Id: Icc1c4bfa296a59a551088fe7cc2449a97bb2b7b7
Reason: Broke the build
 2014-11-25 15:50:59 +00:00
Robin Lee
80559f4aad DevicePolicy: Don't warn about managed profile CAs 
Setting up a managed profile should have included a step to warn about
this sort of thing already. As the user should trust the profile owner
anyway it's hard to argue this warning is needed.

Bug: 18224038
Change-Id: Ie86ba26851af726c0dec30eb9c32894ed6bb4a00
 2014-11-25 15:48:48 +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
3a1c4db53e am b56c4263: am 8cac7309: am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit 'b56c4263c73224ea7c0c0580729a5700c1db87d1':
  Make WallpaperService watch the actual display state.
 2014-11-25 15:16:14 +00:00
Sreeram Ramachandran
10fd39001c am 1cb0044e: am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '1cb0044ece9e3db6ca631daff7d225ce60b67f40':
  Delete unused/non-working code.
 2014-11-25 15:16:10 +00:00
Sreeram Ramachandran
b3e20899fe am 19f47022: am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '19f47022e0c89a11ef03c158d19fa294168da360':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:16:05 +00:00
Sreeram Ramachandran
053ebdb4ea am ca7b0707: am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit 'ca7b07072849fa2e4bf4e074ce1366eb7138befc':
  Eliminate race conditions in UID-based network filtering.
 2014-11-25 15:16:00 +00:00
Geoff Mendal
c26b5b0172 am e86bc05a: (-s ours) am 1df8d4c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e86bc05ac6c7db024858ea7838ded83b6bfdd32b':
  Import translations. DO NOT MERGE
 2014-11-25 15:15:56 +00:00
Jorim Jaggi
b1c6fa5436 am 649c0ca2: am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 
* commit '649c0ca2a418fed4eff92b93e5e825c5814b4870':
  Tint SIM images in PIN/PUK screen
 2014-11-25 15:15:51 +00:00
Adrian Roos
019ab9981e am e33017b4: am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 
* commit 'e33017b404c2ac0aff858439f9c6301ac887c1e2':
  Revert "Only keep user switcher bitmaps if needed"
 2014-11-25 15:15:44 +00:00
Adrian Roos
bc80d9586d am df3be538: am 9b4b2940: am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 
* commit 'df3be538e0a3a5b0a248f36f2fcb4b190a3534f0':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-25 15:15:40 +00:00
Adrian Roos
e1d84dd914 am 9a4d0257: am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '9a4d0257beadf53c706afbcb4abc76c17a44ff00':
  Fix DPM.resetPassword("")
 2014-11-25 15:15:35 +00:00
Christoph Studer
18032a083a am fe6d4f09: am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit 'fe6d4f094d2441314bb31fec10b520f80aeb481e':
  Fix MediaStyle API comments
 2014-11-25 15:15:31 +00:00
Chris Wren
2bf5a4205d am ff47355d: am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev 
* commit 'ff47355d2beb7257568ae9add24e99b3f3c185f7':
  Push back notification means snooze the package.
 2014-11-25 15:15:27 +00:00
Geoff Mendal
395a969152 am bcd7a52e: (-s ours) am 41d3e943: (-s ours) am ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'bcd7a52ead45418042a9b37a2a75fad09ac6bd78':
  Import translations. DO NOT MERGE
 2014-11-25 15:15:23 +00:00
Geoff Mendal
bc6a6bae43 am 40ac6544: (-s ours) am c3ab889f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '40ac65447bc9c7cf4f1b88ddde921fabb2448fe6':
  Import translations. DO NOT MERGE
 2014-11-25 15:15:18 +00:00
Geoff Mendal
86f180fd2d am b57d1ffe: (-s ours) am c6a1070b: (-s ours) am 9be80ee5: (-s ours) Import translations. DO NOT MERGE 
* commit 'b57d1ffe02049d85409131844c836e569cbccce2':
  Import translations. DO NOT MERGE
 2014-11-25 15:15:14 +00:00
Zoltan Szatmary-Ban
e7c1130680 am 3939d6ab: am 8e55c4bf: am 604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev 
* commit '3939d6abf2a4b514e322c1c669da97614ac4510a':
  Add new subcommand 'set-active-admin' to the dpm command.
 2014-11-25 15:15:09 +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
cb17416a8d am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
* commit '0da89b76402816dade084166a97b1d352ae1f78b':
  Fixed several time related states for secondary users
 2014-11-25 15:04:28 +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
tiger_huang
1b33b49723 Prevent showing immersive confirmation unexpectedly 
By design, if the user presses the power key twice within 5 seconds
(panic), it will show immersive confirmation again at the next time
entering immersive mode.

But there is a bug on calculating the time between pressing the power
key. The time get from event.getDownTime() will stop when the device
is sleeping without being charged.

So here uses SystemClock.elapsedRealtime() instead.

https://code.google.com/p/android/issues/detail?id=80772

Change-Id: I4dca9dc260904f1c5b60464834781e2a82a9bcf4
 2014-11-25 12:29:37 +00: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
Jinsuk Kim
449c019f22 CEC: Do not compare active input when updating 
A recent change sets the active path ahead of calling
updateActiveInput. Removes the check between new and active
path as it is always successful thus stops the flow.

Bug: 18506537
Change-Id: I29471ffc6194baa1fad62063f1d192caa9000afd
 2014-11-25 15:01:56 +09:00
Lajos Molnar
5037f945cd media: add support for 160-byte image info in MediaCodec 
Some 64-bit compilers now create 160-byte image structures.

Bug: 18513091
Change-Id: I355714affaac0fde0b03578d13ab8f373dd5aa81
 2014-11-24 21:54:27 -08:00
Erik Kline
37fbfa140a Map TYPE_VPN integer to "VPN" string. 
Bug: 18439110
Change-Id: I0fa0c9e6a9293ab724e2b5e7d0f586f05cd100c7
 2014-11-25 13:16:58 +09:00