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

103738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
4b1042e765 am 2570d0ad: Merge "keystore: remove old APIs" into jb-mr2-dev 
* commit '2570d0ada876b94a91f9665c7469140ba0ddc712':
  keystore: remove old APIs
 2013-04-15 15:30:05 -07:00
Kenny Root
2570d0ada8 Merge "keystore: remove old APIs" into jb-mr2-dev 2013-04-15 22:25:21 +00:00
Svetoslav
7919ea9866 am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev 
* commit '7af3d0560d130e877e6ce6a1c830efa7a945d436':
  Crash on non-eng builds due to lacking null check.
 2013-04-15 14:56:24 -07:00
Svetoslav
f9dd9338d0 am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev 
* commit '289e64974a3be70ff823ee0a0c1fe5ea32a832bb':
  Fully setup newly bound service before state management.
 2013-04-15 14:56:21 -07:00
Svetoslav
7af3d0560d Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev 2013-04-15 21:52:07 +00:00
Svetoslav
289e64974a Merge "Fully setup newly bound service before state management." into jb-mr2-dev 2013-04-15 21:51:22 +00:00
Chris Craik
55b883b0a9 am 30c990c3: Merge "Draw Operation merging" into jb-mr2-dev 
* commit '30c990c361291ad578ef4ffe4a4dd0fd6080797b':
  Draw Operation merging
 2013-04-15 14:31:02 -07:00
Chris Craik
30c990c361 Merge "Draw Operation merging" into jb-mr2-dev 2013-04-15 21:27:11 +00:00
Brian Colonna
df6db6adc2 am 3f1375e5: Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev 
* commit '3f1375e50fa29c500f1ce746ec7421bf6afcd8ff':
  Enabling Face Unlock for user switching (bug 8495282)
 2013-04-15 14:24:10 -07:00
Brian Colonna
3f1375e50f Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev 2013-04-15 21:20:08 +00:00
Amith Yamasani
460071f806 am 919e36d5: Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev 
* commit '919e36d5f689f6a73a879ebd72465f68c1625062':
  Allow non-system apps to use restricted accounts
 2013-04-15 14:02:15 -07:00
Amith Yamasani
919e36d5f6 Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev 2013-04-15 20:59:50 +00:00
Chris Craik
527a3aace1 Draw Operation merging 
Merge simple bitmap draw operations and text operations to avoid
issuing individual gl draws for each operation. Merging other ops to
be done eventually.

The methods are different - the bitmap merging generates a single
mesh for reused, unclipped images (esp. repeated images in a listview)

The text approach queries just defers the normal font rendering until
the last drawText in the sequence that can share the same shader.

Patches are sorted and merged, but don't yet have a multiDraw
implementation. For now, the pretending-to-merge gives better sorting
behavior by keeping similar patches together.

Change-Id: Ic300cdab0a53814cf7b09c58bf54b1bf0f58ccd6
 2013-04-15 13:53:02 -07:00
Amith Yamasani
e993ae197b Allow non-system apps to use restricted accounts 
Anyway they need to request account access and user will be asked to approve access to the account
at runtime.

Bug: 8617168
Change-Id: I31de852b9bb25f496becc3e6470265b5c330e6ad
 2013-04-15 13:42:57 -07:00
Jeff Tinker
29b5e1701b am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev 
* commit '7fa9667f63fe84a2d17ce899121f32bfcec98864':
  Clarify how release of offline keys is handled in the MediaDrm API
 2013-04-15 13:13:39 -07:00
Jeff Tinker
7fa9667f63 Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev 2013-04-15 20:11:18 +00:00
Kenny Root
29638ab758 am e4753968: Merge "Remove old KeyStore call sites" into jb-mr2-dev 
* commit 'e47539684e1431a69893e45bcf9ace4f812edbc8':
  Remove old KeyStore call sites
 2013-04-15 13:00:53 -07:00
Kenny Root
e47539684e Merge "Remove old KeyStore call sites" into jb-mr2-dev 2013-04-15 19:54:55 +00:00
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
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
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
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
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
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
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
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
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
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
87d19d04ea Import translations. DO NOT MERGE 
Change-Id: Ifcb746e1bec6ba3252d57feef425738ef84636e6
Auto-generated-cl: translation import
 2013-04-15 08:59:28 -07:00
Ben Murdoch
e41c3cdb9c am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 
* commit '7e157f321c690e41f0f18a556f989fd20709469f':
  Deprectate WebViewDatabase password methods.
 2013-04-15 08:52:46 -07:00