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

104979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
4b87c54b06 am 097ed01a: Merge "Revert GC thread changes" into jb-mr2-dev 
* commit '097ed01adca362b7c3e49a9301aacbbf3415384a':
  Revert GC thread changes
 2013-04-15 12:43:39 -07:00
Jason Sams
097ed01adc Merge "Revert GC thread changes" into jb-mr2-dev 2013-04-15 19:40:47 +00:00
Jeff Sharkey
328ebf2221 Support persistable Uri permission grants. 
When granting a Uri permission with new PERSIST_GRANT_URI_PERMISSION
flag, persist that grant across device reboots until explicitly
revoked.  Adds new persistedModeFlags dimension to UriPermission,
and moves all flag mutation into UriPermission for clarity.  Adds
flag documentation.  Only inflate HashSet as needed.

Write persisted grants into XML file, saving based on source and
target package name and user handle.  Sanity check grants when
parsing.

Wipe all grants from/to a package when uninstalled, and wipe any
transient grants when a package or user is force stopped.

Persistable grants are always considered "needed."

Change-Id: I3f001571b498fd607456a1257a6383f904d19497
 2013-04-15 12:34:40 -07:00
Baligh Uddin
a114bc7d59 am 4c737f27: am ce370671: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '4c737f27af5c01c62c03040c3b1a0d98329789a6':
  Import translations. DO NOT MERGE
 2013-04-15 12:34:02 -07:00
Kenny Root
cdff9ddfcc am 541e0d6d: resolved conflicts for merge of 6fb172b1 to jb-mr2-dev-plus-aosp 
* commit '541e0d6d1ca26bb51c87b33921a2baf73c8d7f33':
  keystore: Add flag for blobs to be unencrypted
 2013-04-15 12:34:00 -07:00
Kenny Root
bf2147669e AndroidKeyStore: Add encrypted flag 
Add the encrypted flag for the KeyPairGenerator and the KeyStore so that
applications can choose to allow entries when there is no lockscreen.

(partial cherry pick from commit 2eeda7286f3c7cb79f7eb71ae6464cad213d12a3)

Bug: 8122243
Change-Id: I5ecd9251ec79ec53a3b68c0fff8dfba10873e36e
 2013-04-15 19:33:15 +00:00
Geremy Condra
ebbfda9180 Merge "Revert "Add logic to handle changes to file_contexts during update."" 2013-04-15 19:30:24 +00:00
Geremy Condra
994add94c9 Revert "Add logic to handle changes to file_contexts during update." 
This reverts commit 7951ceb0d1b13c430ed72a8a9d92b66f757e5cac in favor of https://googleplex-android-review.googlesource.com/#/c/296692/

Change-Id: I3df44a78f63240f79a047c04be067d9eaf85e303
 2013-04-15 19:30:01 +00:00
Svetoslav
1487cd5afc Crash on non-eng builds due to lacking null check. 
On eng builds we have an event consistency verifier to log any
inconsistent event stream states due to mishandling of intercepted
events by an accessibility service. On non-eng builds this verifier
is null and a null check was lacking.

bug:8616711

Change-Id: Ib083a405dfa8340025090a65e50155eb10526a90
 2013-04-15 12:28:46 -07:00
Baligh Uddin
4c737f27af am ce370671: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'ce370671785630de03ce15ccf3568e10ff8edfd6':
  Import translations. DO NOT MERGE
 2013-04-15 12:27:57 -07:00
Baligh Uddin
7ced495670 Merge "Import translations. DO NOT MERGE" 2013-04-15 19:27:22 +00:00
Kenny Root
541e0d6d1c resolved conflicts for merge of 6fb172b1 to jb-mr2-dev-plus-aosp 
Change-Id: I49dcec1d43e7b8dbbb9b89e2454ec5d657e53e02
 2013-04-15 12:26:49 -07:00
Baligh Uddin
d2251e82fa Merge "Import translations. DO NOT MERGE" 2013-04-15 19:25:31 +00:00
Baligh Uddin
ce37067178 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-15 19:25:11 +00:00
Svetoslav
072906eef8 Fully setup newly bound service before state management. 
If the connected service is not entirely setup when calling the method for
handling a change in the current user state we get a potential NPE since
the management method may have discarded the service, thus nullifying the
connection to it. Now the service is fully configured before calling the
state change management method.

bug:8600489

Change-Id: Ib0bf7c6d575e15c620da419d43ece22f4187fd34
 2013-04-15 12:16:20 -07:00
Daniel Sandler
f45564ee72 Finish annotating Notification.extras. 
This covers all useful data from the basic Builder as well
as each of the Styles that is not otherwise captured on the
Notification object itself.

Extras are now prettyprinted in dump() output.

Bug: 8270485
Change-Id: I47fc50860dab6409793f57e904cc60296310d5cf
 2013-04-15 15:05:08 -04:00
Kenny Root
e1e6b1413b am df8cbfa5: am 5678bacd: Merge "Remove keystore entries when app data cleared" 
* commit 'df8cbfa5e26df48052ee7aafb548af290f818ef7':
  Remove keystore entries when app data cleared
 2013-04-15 12:05:07 -07:00
Kenny Root
df8cbfa5e2 am 5678bacd: Merge "Remove keystore entries when app data cleared" 
* commit '5678bacdffb6871b0d5b428548315cc3bba430bd':
  Remove keystore entries when app data cleared
 2013-04-15 12:01:22 -07:00
Kenny Root
6fb172b12e Merge "keystore: Add flag for blobs to be unencrypted" 2013-04-15 18:29:44 +00:00
Kenny Root
986b9a6008 am e5ea4bf3: resolved conflicts for merge of caf0496d to jb-mr2-dev-plus-aosp 
* commit 'e5ea4bf378ca07b07769e9912a4f0ebbe4f65d8f':
  Check outInfo is not null
 2013-04-15 11:26:46 -07:00
Kenny Root
e5ea4bf378 resolved conflicts for merge of caf0496d to jb-mr2-dev-plus-aosp 
Change-Id: I006f9a5a6b71ab618f88c2ecb848e270128e20a0
 2013-04-15 11:19:31 -07:00
Scott Main
085e0f1240 am feb5a728: am fb5e6bbd: Merge "fix javadoc build" into jb-mr2-dev 
* commit 'feb5a72843ffa6df0140a8c1cfa9c42f6612e19f':
  fix javadoc build
 2013-04-15 11:18:11 -07:00
Geremy Condra
a2dffda3b3 Add logic to handle changes to file_contexts during update. 
Bug: 8116902
Change-Id: I56ad60e5e02c857d3370ec9775fd4e4480e8b458
 2013-04-15 11:17:30 -07:00
Scott Main
feb5a72843 am fb5e6bbd: Merge "fix javadoc build" into jb-mr2-dev 
* commit 'fb5e6bbd2bf9ad8a71fc798be3ef12b950476f43':
  fix javadoc build
 2013-04-15 11:15:33 -07:00
Scott Main
fb5e6bbd2b Merge "fix javadoc build" into jb-mr2-dev 2013-04-15 18:13:17 +00:00
Scott Main
e63b0609c3 fix javadoc build 
Change-Id: I9b86dda5aea075832d5e165043f45c8d507b5c16
 2013-04-15 11:11:44 -07:00
Scott Main
3b9dd0a958 am 168e18d4: am d7f67d6f: am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit '168e18d4b8fdb69a2898f538cd8cd251260a373b':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 11:10:35 -07:00
Daniel Sandler
f3e6e184b1 am 492c67a8: am bd573049: Merge "Putting the gesture debugging back in the box." into jb-mr2-dev 
* commit '492c67a8b12ce154e41dc48102ae99e0c0e5210d':
  Putting the gesture debugging back in the box.
 2013-04-15 11:10:32 -07:00
Kenny Root
4622351159 keystore: Add flag for blobs to be unencrypted 
In order to let apps use keystore more productively, make the blob
encryption optional. As more hardware-assisted keystores (i.e., hardware
that has a Keymaster HAL) come around, encrypting blobs start to make
less sense since the thing it's encrypting is usually a token and not
any raw key material.

(cherry picked from commit a3788b00bb221e20abdd42f747d2af419e0a088c)

Bug: 8122243
Change-Id: Ifc1c64743651b23a4eace208ade0176af47ea989
 2013-04-15 11:09:29 -07:00
Scott Main
168e18d4b8 am d7f67d6f: am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit 'd7f67d6f0b59c5aa0251127baa4c55037c902e7f':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 11:06:58 -07:00
Daniel Sandler
492c67a8b1 am bd573049: Merge "Putting the gesture debugging back in the box." into jb-mr2-dev 
* commit 'bd573049ec5a0c0d73b4835a2308c6737dfff2f3':
  Putting the gesture debugging back in the box.
 2013-04-15 11:06:55 -07:00
Scott Main
d7f67d6f0b am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit '80f8c84e0cf9b2703939af6bb4aeff7000e3fd9e':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 11:04:33 -07:00
Kenny Root
5678bacdff Merge "Remove keystore entries when app data cleared" 2013-04-15 18:03:09 +00:00
Daniel Sandler
bd573049ec Merge "Putting the gesture debugging back in the box." into jb-mr2-dev 2013-04-15 18:02:52 +00:00
Scott Main
80f8c84e0c am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit '0451003f681c830fe626e4e0e6861c0bca8de51f':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 11:00:06 -07:00
Kenny Root
e28b084d14 Remove keystore entries when app data cleared 
When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.

(cherry picked from commit 6fd1c85d7f909580582e5ebc357564331ecef283)

Bug: 8566369
Change-Id: Id4df5e50661b676b8f6507b915764400982c01a0
 2013-04-15 10:57:24 -07:00
Scott Main
0451003f68 am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit 'c06776912d75190966c5f00e617edffbfe01851c':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 10:56:42 -07:00
Scott Main
c06776912d am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit '92fd5508aae8f8b43164405a5b725d0e60e464e1':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 10:52:40 -07:00
Scott Main
92fd5508aa am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit 'c70e0f5e182ab209ab9b272c1408ac3170ca6345':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 10:49:35 -07:00
The Android Open Source Project
44dc8e1c7a am 2c5dca4a: Reconcile with jb-mr2-release - do not merge 
* commit '2c5dca4a3f227d5e4e103bdbd61f584446bd229f':
  Fix keyguard pattern invalidate bug
  Ensure looper quits after all other messages are handled.
 2013-04-15 10:49:03 -07:00
The Android Open Source Project
2c5dca4a3f Reconcile with jb-mr2-release - do not merge 
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
 2013-04-15 10:46:07 -07:00
Scott Main
c70e0f5e18 Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 2013-04-15 17:45:22 +00:00
Kenny Root
caf0496dc2 Merge "Check outInfo is not null" 2013-04-15 17:44:59 +00:00
Kenny Root
fc78e60a83 Check outInfo is not null 
Only call keystore if outInfo is not null

(cherry picked from commit 3b9933d0c2f2b9a2e973dca296ee45a69087e31c)

Bug: 8568820
Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28
 2013-04-15 10:42:14 -07:00
Jean-Michel Trivi
46863c6dea am 42732e10: am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 
* commit '42732e1037b48e9bf71e9965bc28ddb5d8242fa4':
  Public APIs for media position in RemoteControlClient
 2013-04-15 10:22:42 -07:00
Kristian Monsen
98dedf7ccc Fix for bug 8607049: Improve javascript dialogs for classic 
Make a common JsDialogHelper for classic and chromium webview
Improve on before unload dialog

Change-Id: Ib9711e4f95189ef8b2b31fc64aec7c0cb535d0e4
 2013-04-15 10:22:34 -07:00
Jean-Michel Trivi
42732e1037 am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 
* commit '74e56f19299cd04e2e6c6a9a19af260551750d6a':
  Public APIs for media position in RemoteControlClient
 2013-04-15 10:19:24 -07:00
Jean-Michel Trivi
74e56f1929 Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 2013-04-15 17:13:46 +00:00
Baligh Uddin
a1a67eb23d Import translations. DO NOT MERGE 
Change-Id: Ifb0c975361e9e00feb3957139cf2c15a463a5319
Auto-generated-cl: translation import
 2013-04-15 09:19:05 -07:00
Baligh Uddin
18148ab9bc Import translations. DO NOT MERGE 
Change-Id: Id459e72b14f63a9c4428c6ca67e600d9a0b6ec3f
Auto-generated-cl: translation import
 2013-04-15 09:08:04 -07:00