103908 Commits

Author SHA1 Message Date
Dirk Dougherty
9fbc8f70b6 am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit 'edf2ab16fe011667dbae8c6c351bd3ac36958326':
  Doc change: add policy guidelines documents.
2013-04-15 15:51:25 -07:00
Dirk Dougherty
edf2ab16fe am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit 'b345693f0ff0705ba1eedd3b49c21d14dc78c6b6':
  Doc change: add policy guidelines documents.
2013-04-15 15:47:11 -07:00
Dirk Dougherty
b345693f0f am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit '5a9c5b67ca6d8c35bb4522bd0618bf50f246f7ef':
  Doc change: add policy guidelines documents.
2013-04-15 15:44:46 -07:00
Kenny Root
6a67a38f46 Merge "AndroidKeyStore: Add encrypted flag" 2013-04-15 22:44:41 +00:00
Dirk Dougherty
5a9c5b67ca am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit 'b02d529a2faaca629e7c51e4c4ccd7fe34ddb376':
  Doc change: add policy guidelines documents.
2013-04-15 15:41:56 -07:00
Dirk Dougherty
b02d529a2f am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.
* commit '6859939fe88de8b42117a3d0798dccb0c594e568':
  Doc change: add policy guidelines documents.
2013-04-15 15:37:56 -07:00
Dianne Hackborn
c51d050f1b Maybe fix issue #8620910: Win_sdk build failed and unable to create...
...the sdk platform repo

Change-Id: Ib6cd7c0dfb9b6217ae79af3e2ac25fe0442996e3
2013-04-15 15:36:53 -07:00
Irfan Sheriff
0b132962e4 Fix CTS failure due to invalid EAP update
Update EAP only when it has valid entry

Bug: 8604987
Change-Id: Ib6b10bd06c26ee91c4ecd3a231b509d728725dfc
2013-04-15 22:36:45 +00:00
Dirk Dougherty
6859939fe8 am 99a79e80: Doc change: add policy guidelines documents.
* commit '99a79e807b4bab154c9904a05d05dda4b420206a':
  Doc change: add policy guidelines documents.
2013-04-15 15:34:08 -07:00
David Christie
1b9b7b1f1b Fix security issues with LocationManager where apps with coarse permissions
can get location updates too frequently by repeatedly calling getLastKnownLocation
or by registering/unregistering location updates frequently.

Change-Id: Ibd9ce28b0401372b995a0dbfb2f0a984dd11c0b1
2013-04-15 15:31:11 -07:00
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
Chet Haase
face742d31 Avoid repositioning unattached overlay views
Adding a view to an overlay usually entails removing the
view from its current parent, if it has one. ViewOverlay.add() will
do this automatically. At the same time, it will check to see whether
the parent view is in a different global location than the overlay's
host view, and will adjust the added view accordingly. This enables
the caller to simply toss a view into an overlay and have it end up
at the same global position on the screen.

the problem is that the current code doesn't bother to check whether
the old parent is attached. If that parent has been removed from the
view hierarchy before this overlay operation, then it will show up as
being at (0,0) in the window, not its old location. This results in the
view being mis-positioned in the overaly.

Fix is simple: if the view's old parent is not attached, simply remove
it from that parent before adding it to the overlay; don't try to compensate
for its position which is based on wrong information.

Issue #8620319 Overlay should only use relative window locations for onscreen parents

Change-Id: I414038a6c355dfd58f9766b007ac44d535ef1889
2013-04-15 15:15:59 -07:00
Dianne Hackborn
1c5383ce0b Fix issue #8512015: VideoView's window animates when its position changes
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b
2013-04-15 15:07:21 -07:00
Geremy Condra
f33575b05b Add logic to handle changes to file_contexts during update.
Bug: 8116902

(cherry picked from commit a2dffda3b3bc4f0bccb175ef4569e45a221d0eb2)

Change-Id: I57c21681d5f94e00d0214fb520ea62af4ea5b025
2013-04-15 14:56:58 -07: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
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
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
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
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