104950 Commits

Author SHA1 Message Date
Chris Craik
55709fc1c7 am 55b883b0: am 30c990c3: Merge "Draw Operation merging" into jb-mr2-dev
* commit '55b883b0a960b37aa453253f3ccb614dd95c221c':
  Draw Operation merging
2013-04-15 14:34:35 -07: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
Brian Colonna
647e4b82fe am df6db6ad: am 3f1375e5: Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev
* commit 'df6db6adc2fd09da77a028539e802e69d0a8d6a1':
  Enabling Face Unlock for user switching (bug 8495282)
2013-04-15 14:27:40 -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
18197ec438 am 460071f8: am 919e36d5: Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev
* commit '460071f806337f09ff789892979935916323e6a1':
  Allow non-system apps to use restricted accounts
2013-04-15 14:06:34 -07: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
Craig Mautner
967212cb54 Implement stack splitting and task movement.
Split stacks and move tasks between them. Layout the windows
according to the new stack split.

After layout content rectangles are known split the available area
between all stack boxes. Then use those values for future layout.

Provide stack contents to ActivityManager.

Change-Id: I9746e6185445633810d506be514d0b7b540a7f99
2013-04-15 13:46:47 -07:00
Geremy Condra
edf10b18c5 Merge "Add logic to handle changes to file_contexts during update." 2013-04-15 20:43:51 +00: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 Sharkey
ba1bd9aab2 Merge "Support persistable Uri permission grants." 2013-04-15 20:23:14 +00:00
Jeff Tinker
4efc5b5cfb am 29b5e170: am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev
* commit '29b5e1701bdf06861d0eae4a3be05a7012c5e1c6':
  Clarify how release of offline keys is handled in the MediaDrm API
2013-04-15 13:17:41 -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
0ab49f1cc8 am 29638ab7: am e4753968: Merge "Remove old KeyStore call sites" into jb-mr2-dev
* commit '29638ab758ec5274b3fbf4974149d1cd05a00bd6':
  Remove old KeyStore call sites
2013-04-15 13:04:52 -07: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
e8ed1eeb3f am 4b87c54b: am 097ed01a: Merge "Revert GC thread changes" into jb-mr2-dev
* commit '4b87c54b06ed6834785ea06e066bb1e988a76973':
  Revert GC thread changes
2013-04-15 12:47:30 -07: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
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