Daniel Sandler
f094d221e5
Merge "Finish annotating Notification.extras." into jb-mr2-dev
2013-04-16 01:38:54 +00:00
Kristian Monsen
639857f7f4
Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev
2013-04-15 23:54:43 +00:00
David Christie
feedb1b095
Merge "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." into jb-mr2-dev
2013-04-15 23:35:44 +00:00
Dianne Hackborn
0985ac0431
Merge "Maybe fix issue #8620910 : Win_sdk build failed and unable to create..." into jb-mr2-dev
2013-04-15 23:23:31 +00:00
Dianne Hackborn
a59a19abb8
Merge "Fix issue #8512015 : VideoView's window animates when its position changes" into jb-mr2-dev
2013-04-15 23:22:48 +00:00
Geremy Condra
bffe377bca
Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev
2013-04-15 23:11:12 +00:00
Irfan Sheriff
ed8cdbb780
Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev
2013-04-15 22:52:33 +00:00
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
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
2570d0ada8
Merge "keystore: remove old APIs" into jb-mr2-dev
2013-04-15 22:25:21 +00: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
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
30c990c361
Merge "Draw Operation merging" into jb-mr2-dev
2013-04-15 21:27:11 +00: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
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
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
e47539684e
Merge "Remove old KeyStore call sites" into jb-mr2-dev
2013-04-15 19:54:55 +00: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
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
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
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
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
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
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
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
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
7e157f321c
Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev
2013-04-15 15:48:25 +00:00
Brian Colonna
a5239891dc
Enabling Face Unlock for user switching (bug 8495282)
...
We had been intentionally disabling FUL when switching to a new user.
The reason was that we were only getting a signal when the user switch
started, not when it completed. If we started FUL at the beginning of
the user switch, it could be completed by the time the user switch
completed. We now have a signal to tell us that the switch completed.
Prior to this change, FUL would start whenever keyguard is created.
For a user switch, keyguard is recreated when we get
onUserSwitching(), but we don't want FUL to start until we get
onUserSwitchComplete(). So with this change, if onResume() happens
because of a user switch it doesn't start FUL until we get
onUserSwitchComplete().
Change-Id: I1d3da0a32b9b4cf0cfa5c577f1697d2a41ee4fda
2013-04-15 11:45:40 -04:00
Andreas Huber
2de0771da2
Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev
2013-04-15 15:16:27 +00:00
Andreas Huber
5c5c3f3abd
Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev
2013-04-15 15:15:41 +00:00
Jason Sams
330a9fe323
Merge "Unhide new RS APIs." into jb-mr2-dev
2013-04-15 02:22:14 +00:00