OSDN Git Service
Amith Yamasani [Thu, 25 Jun 2015 00:24:18 +0000 (00:24 +0000)]
Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 00:09:05 +0000 (00:09 +0000)]
Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev
Adam Powell [Thu, 25 Jun 2015 00:08:52 +0000 (00:08 +0000)]
Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev
Alan Viverette [Thu, 25 Jun 2015 00:03:48 +0000 (17:03 -0700)]
Avoid negative childSpecSize in RelativeLayout
Bug:
22071351
Change-Id: I951fd7c7973c49581d3ea30bae64d6c20bc362be
ztenghui [Wed, 24 Jun 2015 23:32:16 +0000 (23:32 +0000)]
Merge "Resize the VectorDrawable according to the virtual Dpi" into mnc-dev
Alan Viverette [Wed, 24 Jun 2015 23:15:14 +0000 (23:15 +0000)]
Merge "Update local state when creating LayerDrawable from constant state" into mnc-dev
Junda Liu [Wed, 24 Jun 2015 21:41:14 +0000 (14:41 -0700)]
Rename and add carrier config keys for volte and ims.
Bug: b/
21878236
Change-Id: I2bc36664969fce9e773ce8a53d56b92936d96971
Tim Murray [Wed, 24 Jun 2015 22:59:51 +0000 (22:59 +0000)]
Merge "add cpuset support" into mnc-dev
Amith Yamasani [Wed, 24 Jun 2015 22:46:09 +0000 (15:46 -0700)]
No need to check WRITE_SETTINGS permission in ContentProvider
Permission checks are enforced within the SettingsProvider specifically
for SECURE/SYSTEM/GLOBAL. Now WRITE_SETTINGS is runtime, so it shouldn't
apply to all the settings types.
Bug:
22044704
Change-Id: I9ed25d96b2fa4f46d3d049efa4300cd1d37bbd24
Selim Cinek [Wed, 24 Jun 2015 22:19:57 +0000 (22:19 +0000)]
Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev
Selim Cinek [Wed, 24 Jun 2015 22:19:37 +0000 (22:19 +0000)]
Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev
Chris Wren [Wed, 24 Jun 2015 22:17:39 +0000 (22:17 +0000)]
Merge "remove setLatestEventInfo" into mnc-dev
ztenghui [Wed, 24 Jun 2015 20:23:40 +0000 (13:23 -0700)]
Resize the VectorDrawable according to the virtual Dpi
b/
21928507
Change-Id: I9e596192a0fdf13fc91481f990a345c3b267f225
Joe Fernandez [Wed, 24 Jun 2015 21:52:49 +0000 (21:52 +0000)]
am
1ee8470c: am
3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '
1ee8470ca399362424544e763dcb67e515590b10':
docs: Update Android support page
Alan Viverette [Wed, 24 Jun 2015 21:42:44 +0000 (14:42 -0700)]
Update local state when creating LayerDrawable from constant state
Also clears DrawableContainer's futures list when it's no longer needed,
correctly sets deep copy of state set in StateListDrawable, makes some
private methods into package-protected to avoid thunk, and propagates
state to StateListDrawable's super class so that getState() has correct
information.
Bug:
21840003
Change-Id: I0d4232807f280d663c03b4a80e4aab8626806440
Joe Fernandez [Wed, 24 Jun 2015 21:38:28 +0000 (21:38 +0000)]
am
3eefa1f9: Merge "docs: Update Android support page" into mnc-preview-docs
* commit '
3eefa1f9de9e6466251373074f3c720936b62a8c':
docs: Update Android support page
Adam Lesinski [Wed, 24 Jun 2015 21:32:36 +0000 (21:32 +0000)]
Merge "Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()" into mnc-dev
Joe Fernandez [Wed, 24 Jun 2015 21:30:02 +0000 (21:30 +0000)]
Merge "docs: Update Android support page" into mnc-preview-docs
ztenghui [Wed, 24 Jun 2015 21:27:14 +0000 (21:27 +0000)]
Merge "Update the internal test case to show the strokeWidth can scale now" into mnc-dev
Joe Fernandez [Wed, 24 Jun 2015 20:48:26 +0000 (13:48 -0700)]
docs: Update Android support page
- remove Helpouts
- remove Merchant issue reporting link
- remove other dead links
- clean up page code
b\
18579472
b\
19355066
Change-Id: If55aa57b11604bdd328c55e26ad5bd4ba0b32de7
Winson Chung [Wed, 24 Jun 2015 21:21:23 +0000 (21:21 +0000)]
Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev
Raph Levien [Wed, 24 Jun 2015 21:12:33 +0000 (21:12 +0000)]
Merge "Make measureText(String, int, int) not use context" into mnc-dev
Winson Chung [Tue, 23 Jun 2015 18:52:04 +0000 (11:52 -0700)]
Catching launch errors when trying to go Home while Home is updating.
Bug:
21442898
Change-Id: I7fc74422b220cb02acb195b5c9121ff72bc16dbe
ztenghui [Wed, 24 Jun 2015 21:06:53 +0000 (14:06 -0700)]
Update the internal test case to show the strokeWidth can scale now
Change-Id: I16b0a232eb4108aedc9289e51a52ec9472b9dfd0
Raph Levien [Wed, 24 Jun 2015 16:36:31 +0000 (09:36 -0700)]
Make measureText(String, int, int) not use context
The measureText method when applied to a string should just measure
the substring, rather than treat the entire string as context. It was
less likely to cause problems than the similar issues with char
arrays, but still wrong. This patch makes the behavior consistent.
Bug:
20087437
Change-Id: I1c6e07a694b151f4fb097edae8e271805e996d06
Adam Powell [Wed, 24 Jun 2015 20:54:10 +0000 (13:54 -0700)]
Fix ChooserActivity check for still-alive ChooserTargets
Only prune ChooserTargets if the resolved activity source they came
from is still present after refreshing the list. Compare this directly
against the ComponentName rather than ResolveInfo.equals, as the
latter isn't implemented.
Bug
21953672
Change-Id: I6486bda85c19d7371167affe2a2b80a2668bd734
Adam Lesinski [Wed, 24 Jun 2015 20:24:35 +0000 (13:24 -0700)]
Allow callers holding PACKAGE_USAGE_STATS permission to call ActivityManager#getPackageImportance()
Bug:
22055550
Change-Id: I1e732e95698daf44bcb223cafde3d3c22746d232
Christopher Tate [Wed, 24 Jun 2015 20:35:17 +0000 (20:35 +0000)]
Merge "Require that verified intent filters only have http/https <data> decls" into mnc-dev
Andrew Solovay [Wed, 24 Jun 2015 20:27:51 +0000 (20:27 +0000)]
am
f5222156: am
00ebd145: docs: Added "Single Use Devices" video to Android for Work main page
* commit '
f522215653bef1dc6bc5a140d6e1cb0cd2db7824':
docs: Added "Single Use Devices" video to Android for Work main page
Christopher Tate [Wed, 24 Jun 2015 02:23:46 +0000 (19:23 -0700)]
Require that verified intent filters only have http/https <data> decls
It is malformed to write a single intent filter like this:
<intent-filter android:autoVerify="true">
<data android:host="foo.example"
android:path="/"
android:scheme="http" />
<data android:host="*"
android:path="/custom"
android:scheme="fooexamplecustomscheme" />
</intent-filter>
In practice this app is accidentally defining a filter that will match
"http://*". This is now detected, and will never be auto-verified for
any of the mentioned domains.
Verified intent filters must *only* handle the http & https schemes.
Bug
21920537
Change-Id: I933cddbea23185d242565cac940e1e7a7e4e289b
Andrew Solovay [Wed, 24 Jun 2015 20:15:17 +0000 (20:15 +0000)]
am
00ebd145: docs: Added "Single Use Devices" video to Android for Work main page
* commit '
00ebd145d1572e0d12403ed0194d540926996f0e':
docs: Added "Single Use Devices" video to Android for Work main page
Alex Klyubin [Wed, 24 Jun 2015 20:03:08 +0000 (20:03 +0000)]
Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-dev
Tony Mantler [Wed, 24 Jun 2015 19:48:32 +0000 (19:48 +0000)]
Merge "Notify on BAD_REMOVAL and pass fsUuid in broadcast" into mnc-dev
Christopher Tate [Wed, 24 Jun 2015 19:45:27 +0000 (19:45 +0000)]
Merge "Fix NPE when walking the set of packages to update app link policy" into mnc-dev
Makoto Onuki [Wed, 24 Jun 2015 19:25:26 +0000 (19:25 +0000)]
Merge "Actually wait for installd" into mnc-dev
Christopher Tate [Wed, 24 Jun 2015 19:18:05 +0000 (12:18 -0700)]
Fix NPE when walking the set of packages to update app link policy
Bug
21851441
Change-Id: I3616c5a7e40f5ff9ad9bbfee579a4a2fb2b1f7fd
Chris Wren [Wed, 24 Jun 2015 19:18:34 +0000 (15:18 -0400)]
remove setLatestEventInfo
This has been deprecated since API 11.
Bug:
18510449
Change-Id: Ibd052572aa8c332daf5f6a604afe1925e8998a2b
Andrew Solovay [Wed, 24 Jun 2015 18:56:56 +0000 (11:56 -0700)]
docs: Added "Single Use Devices" video to Android for Work main page
See first comment for doc stage location.
Change-Id: I0b64f8462eebc5d11c7972fd49147fdd1d6cdd3a
John Spurlock [Wed, 24 Jun 2015 18:46:51 +0000 (18:46 +0000)]
Merge "Volume Motion: Initial show and expand transition." into mnc-dev
Adam Lesinski [Wed, 24 Jun 2015 18:45:44 +0000 (18:45 +0000)]
Merge "Fix unit issue in Slog.wtf output" into mnc-dev
Tony Mantler [Wed, 24 Jun 2015 18:45:25 +0000 (11:45 -0700)]
Notify on BAD_REMOVAL and pass fsUuid in broadcast
b/
21328721
Change-Id: I6d2fd18468bcde72e4c050b975fd7286716fbc50
Adam Lesinski [Wed, 24 Jun 2015 18:37:26 +0000 (11:37 -0700)]
Fix unit issue in Slog.wtf output
Bug:
22063930
Change-Id: I02add66892eb32b1df7e845b8542beb928d2b3ca
Alan Viverette [Wed, 24 Jun 2015 18:22:31 +0000 (18:22 +0000)]
Merge "Constrain FastScroller max width to be >= 0" into mnc-dev
Todd Volkert [Wed, 24 Jun 2015 18:10:37 +0000 (11:10 -0700)]
Remove unused PermissionsInfo class
b/
22008424
Change-Id: I53fc04af89c89cc1726dd80b05f2e18d5cc53524
John Spurlock [Wed, 17 Jun 2015 15:56:12 +0000 (11:56 -0400)]
Volume Motion: Initial show and expand transition.
Also re-enable the content collapse layout transition animations,
supported by ensuring the dialog window is tall enough for long
enough to complete the transition, avoiding clipping.
Bug:
21335976
Change-Id: Ibc4cbb1e882c1e11c4406463752afa177fb1e6d7
Chris Craik [Wed, 24 Jun 2015 17:57:59 +0000 (17:57 +0000)]
Merge "Avoid over-damaging layer area for multidraws" into mnc-dev
Chris Wren [Wed, 24 Jun 2015 17:54:21 +0000 (17:54 +0000)]
Merge "don't clear notification effects in response to peeks" into mnc-dev
Geoff Mendal [Wed, 24 Jun 2015 17:48:31 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Nancy Chen [Wed, 24 Jun 2015 17:37:16 +0000 (17:37 +0000)]
Merge "Add public action to open voicemail settings." into mnc-dev
Santos Cordon [Wed, 24 Jun 2015 17:37:06 +0000 (17:37 +0000)]
Merge "InCallService meta-data [2/4]" into mnc-dev
Santos Cordon [Wed, 24 Jun 2015 17:36:56 +0000 (17:36 +0000)]
Merge "Additional javadoc." into mnc-dev
Geoff Mendal [Wed, 24 Jun 2015 17:30:01 +0000 (10:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa40f7574852f801ed717c87cc9803a64dac5d78
Auto-generated-cl: translation import
Alan Viverette [Wed, 24 Jun 2015 17:22:02 +0000 (10:22 -0700)]
Constrain FastScroller max width to be >= 0
Bug:
22055552
Change-Id: Ib0bba93e5490ad9d8668c9532f23654a8cb702d9
Chris Wren [Tue, 23 Jun 2015 15:22:20 +0000 (11:22 -0400)]
don't clear notification effects in response to peeks
When the heads up appears it generates a visibility event for the panel.
This always clears the notification effects (buzz, beep, blink).
If we suppress that for heads up notifications, we never get another chance.
So we add a new call when we open the shade from the heads up to catch this case.
Bug:
20947591
Change-Id: I233e5346617ca2fce7851bd85154c838849df8f7
Selim Cinek [Wed, 24 Jun 2015 17:17:56 +0000 (13:17 -0400)]
Fixed an inconsistency when booting up with SIMPIn
The lockscreen was skipped when the security mode was
swipe, which is inconsistent with the normal bootup
behavior.
Bug:
21850021
Change-Id: I2c59b1428d489fad566097771ca449ba667f34d2
Makoto Onuki [Tue, 23 Jun 2015 23:33:48 +0000 (16:33 -0700)]
Actually wait for installd
Bug
19337445
Change-Id: I70bdaa0ac3695ac9d03ba34fe9d35fe775a5300d
Selim Cinek [Wed, 24 Jun 2015 02:05:58 +0000 (22:05 -0400)]
Fixed a bug with encryption where the keyguard was never shown with PIN
This led to the network being unusable.
We now ensure that the Keyguard is not notified of the SIM PIN
changes until after the initial dismissal logic is done.
In addition, the fullscreen PIN is now always shown immediately
and not until the user swipes up, which was an error before.
Also made sure that the Keyguard Scrim is correctly visible
when shown.
Bug:
21850021
Change-Id: I81804124bae30adf0e17e26cc42f67e48fc446e8
Chris Craik [Wed, 24 Jun 2015 00:33:06 +0000 (17:33 -0700)]
Avoid over-damaging layer area for multidraws
bug:
19608961
Change-Id: Ib7495f155da62a352e9a010a362fd40ec0acad21
Esteban Talavera [Wed, 24 Jun 2015 16:42:33 +0000 (16:42 +0000)]
Merge "Reset permission policy to default when device owner goes away" into mnc-dev
Esteban Talavera [Wed, 24 Jun 2015 14:23:42 +0000 (15:23 +0100)]
Reset permission policy to default when device owner goes away
Otherwise after the Device Owner is gone, runtime
permissions might still be auto granted/denied.
I understand that there are many other policies that
we don't reset after the device/profile owner goes
away (e.g. keyguard enabled/disabled). At least now
we have a single method when we could clear the
ones that we care about.
Bug:
21889278
Change-Id: I6997655e6ef6d474bd25ae1c323eca5b17944b16
Michael Wright [Wed, 24 Jun 2015 16:12:17 +0000 (16:12 +0000)]
Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-dev
Luan Nguyen [Wed, 24 Jun 2015 15:29:47 +0000 (15:29 +0000)]
am
c1b4b058: am
c5a480d1: am
fdad629f: am
6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
* commit '
c1b4b0580ccdbccee25f4bc97e94530e4982e1f7':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
Luan Nguyen [Wed, 24 Jun 2015 15:16:57 +0000 (15:16 +0000)]
am
c5a480d1: am
fdad629f: am
6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
* commit '
c5a480d112f6ce8645d9e294c42b2baab3b56ab9':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
Luan Nguyen [Wed, 24 Jun 2015 15:05:13 +0000 (15:05 +0000)]
am
fdad629f: am
6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
* commit '
fdad629fc089783fa0b3caad62ba99a9083f8645':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
Tom Hudson [Wed, 24 Jun 2015 14:53:56 +0000 (14:53 +0000)]
Merge "Sync canvas proxy CTM (b/
21945972)" into mnc-dev
Luan Nguyen [Wed, 24 Jun 2015 14:51:30 +0000 (14:51 +0000)]
am
6859a9f0: Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
* commit '
6859a9f09049d1dc760b98a6cbb278b591de63a6':
docs: Pare down the adb guide and remove sections that are duplicated in the tools list.
Luan Nguyen [Wed, 24 Jun 2015 14:43:29 +0000 (14:43 +0000)]
Merge "docs: Pare down the adb guide and remove sections that are duplicated in the tools list." into lmp-docs
Tom Hudson [Wed, 24 Jun 2015 13:13:50 +0000 (09:13 -0400)]
Sync canvas proxy CTM (b/
21945972)
SkiaCanvasProxy was being created with an identity transform, ignoring
any transform that may have been applied in Java (or C++) to the
android graphics Canvas it was proxy for. This CL makes sure the
DisplayListCanvas transform is propagated to the Proxy every time
asSkCanvas() is called.
We could instead move the code to the SkiaCanvasProxy constructor
if we got rid of the cached proxy on DisplayListCanvas; nobody's
using the proxy heavily enough that that should be a performance
hit at this time.
BUG:
21945972
R=djsollen@google.com
Change-Id: I99ed1563802a2449bb9939cb67976cd60dd8611c
Geoff Mendal [Wed, 24 Jun 2015 13:58:21 +0000 (08:58 -0500)]
Import translations. DO NOT MERGE
Change-Id: I23e3d5c71af8db285d657cf5dafbebc5c4bbad6b
Auto-generated-cl: translation import
Andrei Stingaceanu [Wed, 24 Jun 2015 09:16:34 +0000 (09:16 +0000)]
Merge "Floating toolbar shown after rotation in extract mode" into mnc-dev
Lorenzo Colitti [Wed, 24 Jun 2015 08:13:08 +0000 (17:13 +0900)]
Use heads-up notifications when selecting networks with no Internet
Currently, when connecting to a network that has a captive portal
or has no Internet access, we display a regular notification.
Because this notification is easy to miss, switch to using a
heads-up notification if the user just manually selected the
network. If the system connects automatically, continue to use a
regular notification.
Bug:
20081183
Change-Id: I7a988b2bddfe898a0d2607ad85a04b227d678469
Lorenzo Colitti [Wed, 24 Jun 2015 05:39:39 +0000 (05:39 +0000)]
Merge "Fix build." into mnc-dev
Lorenzo Colitti [Wed, 24 Jun 2015 05:37:29 +0000 (14:37 +0900)]
Fix build.
Per comments in http://ag/704632 , purgeResources was intended to
be hidden.
Bug:
18386420
Change-Id: Iced006878f86c6b7b15dd38f5e704a2f97aeeda5
Daniel Sandler [Wed, 24 Jun 2015 05:27:05 +0000 (01:27 -0400)]
Fix build.
We don't need purgeResources public since it's part of the
ashmem internal optimization.
Change-Id: I65ba7545cf4801a8b97f3ece9b5ee5100c0f1c97
Jae Seo [Wed, 24 Jun 2015 04:53:06 +0000 (04:53 +0000)]
Merge "TIF: Use per-user ContentResolver in the TvInputManagerService" into mnc-dev
Brian Carlstrom [Wed, 24 Jun 2015 04:36:11 +0000 (04:36 +0000)]
Merge "Add missing NULL check for android_os_Parcel_writeInt" into mnc-dev
Jae Seo [Wed, 24 Jun 2015 03:33:25 +0000 (20:33 -0700)]
TIF: Use per-user ContentResolver in the TvInputManagerService
When switched to a different user (e.g. Restricted profile), the
TvInputManagerService continues to use the TV storage of the previous
user for logging, resulting in failure of the FOREIGN KEY constraint
since channel data for the current user don’t match to the logging data.
This change ensures that the system service uses the proper
ContentResolver when the user is switched.
Bug:
22047202
Change-Id: I870b5bd921e37a5f1219ea66c7a51314c77ddb01
Alex Klyubin [Tue, 23 Jun 2015 01:09:35 +0000 (18:09 -0700)]
Keymaster INT, LONG and DATE tag values are unsigned.
This CL ensures that Android Keystore framework code complies with
signedness of keymaster tags. In particular:
* INT tags are unsigned 32-bit numbers, and
* LONG and DATE tags are unsigned 64-bit numbers.
The ensure compliance, KeymasterArguments and KeyCharacteristics
classes through which Android Keystore interacts with Keymaster tags
have been modified as follows:
* ENUM and INT tags which used to be conflated are now added/queried
via separate methods, because ENUM can remain represented as an int
data type whereas INT is now represented as a long data type with
permitted range being [0; 2^32).
* Methods for adding/quering LONG tags have been switched from the long
data type to the BigInteger data type and now ensure that the value
is in the permitted [0; 2^63).
* Methods for adding/querying DATE tags now ensure the Date value is
in the permitted range [0; 2^63) ms since Unix epoch.
* Methods for adding tags throw an IllegalArgumentException if the tag
type is unsuitable for the method. This is to ensure that tags with
invalid values cannot be added through similar methods (e.g., INT tag
added via an ENUM tag addition method invoked with a negative value).
Bug:
22008538
Change-Id: I6eefd5cbb561cc52d27de952691af4d9d5e1af1e
Svetoslav [Wed, 24 Jun 2015 02:20:06 +0000 (02:20 +0000)]
Merge "Update the storage permission group icon" into mnc-dev
Svetoslav [Wed, 24 Jun 2015 02:18:23 +0000 (19:18 -0700)]
Update the storage permission group icon
bug:
21730509
Change-Id: I2ea2d99febac0e57a3ad3e2fc35f629ed0d2f9ec
Dan Sandler [Wed, 24 Jun 2015 02:10:23 +0000 (02:10 +0000)]
Merge "Allow an icon to carry a tint with it, wherever it goes." into mnc-dev
Daniel Sandler [Wed, 24 Jun 2015 02:09:56 +0000 (02:09 +0000)]
Merge "Use ashmem backed bitmaps for passing around notifications" into mnc-dev
Simranjit Singh Kohli [Wed, 24 Jun 2015 01:24:42 +0000 (01:24 +0000)]
Merge "[Modify LastAuthenticatedTimestamp behaviour]:" into mnc-dev
Brian Carlstrom [Wed, 24 Jun 2015 01:02:12 +0000 (18:02 -0700)]
Add missing NULL check for android_os_Parcel_writeInt
All other usages of nativePtr were already checked.
Bug:
21636519
Change-Id: Icc09ce4326e6b05c5a248cc4de84ae231d5690b1
Svetoslav [Wed, 24 Jun 2015 00:13:26 +0000 (17:13 -0700)]
Only current IME and spell checker can access user dictionary
Change-Id: I6c5716d4d6ea9d5f55a71b6268d34f4faa3ac043
Ricardo Garcia [Wed, 24 Jun 2015 00:24:40 +0000 (00:24 +0000)]
Merge "Fix for SafeMedia logic and CTS tests" into mnc-dev
Chris Craik [Wed, 24 Jun 2015 00:12:49 +0000 (00:12 +0000)]
Merge "Unify clipping return value behavior - true if not empty" into mnc-dev
Bryce Lee [Wed, 24 Jun 2015 00:07:53 +0000 (00:07 +0000)]
Merge "resolved conflicts for merge of
91d2cbf4 to mnc-dev" into mnc-dev
Bryce Lee [Wed, 24 Jun 2015 00:06:51 +0000 (17:06 -0700)]
resolved conflicts for merge of
91d2cbf4 to mnc-dev
Change-Id: I1c7e2999483a7959630844ecd20f5f37b7896aae
Makoto Onuki [Wed, 24 Jun 2015 00:04:41 +0000 (00:04 +0000)]
Merge "Remove default activity title to prevent talkback from..." into mnc-dev
Makoto Onuki [Tue, 23 Jun 2015 21:29:25 +0000 (14:29 -0700)]
Remove default activity title to prevent talkback from...
reading the wrong title.
We get a title from DocumentProvider with an async task, and by the time we
get it, it's *usually* too late and talkback end up reading the default title.
Bug
20041072
Change-Id: I7686fe4ae4c157ebfc07bd8b895c4cfdf99c057a
Alan Viverette [Tue, 23 Jun 2015 23:41:01 +0000 (23:41 +0000)]
Merge "Throw IAE on invalid measure spec size" into mnc-dev
Dianne Hackborn [Tue, 23 Jun 2015 23:34:20 +0000 (23:34 +0000)]
Merge "Fix issue #
20654534: API Review: android.app.assist" into mnc-dev
Ruben Brunk [Tue, 23 Jun 2015 23:33:21 +0000 (23:33 +0000)]
Merge "Update DngCreator to handle pre-correction dimens." into mnc-dev
Sharvil Nanavati [Tue, 23 Jun 2015 23:24:08 +0000 (23:24 +0000)]
Merge "resolved conflicts for merge of
64a4858b to mnc-dev" into mnc-dev
Alan Viverette [Tue, 23 Jun 2015 23:23:49 +0000 (16:23 -0700)]
Throw IAE on invalid measure spec size
Crash immediately so that we can track down the cause. If we let it
through, we'll hit an ISE later in dispatchVsync() and never know why.
Bug:
21948478
Change-Id: I84edf93cdf09d755419e18a7606b7b6cbd059956
Sharvil Nanavati [Tue, 23 Jun 2015 23:23:06 +0000 (16:23 -0700)]
resolved conflicts for merge of
64a4858b to mnc-dev
Change-Id: I9340b816232285853740c03d5e9898fdd019ff0e
Ruben Brunk [Tue, 23 Jun 2015 02:17:30 +0000 (19:17 -0700)]
Update DngCreator to handle pre-correction dimens.
Bug:
20491394
Change-Id: I0cdf7cec104bcb5683139c81fc52c8a0a7d2365c
Doris Liu [Tue, 23 Jun 2015 23:20:01 +0000 (23:20 +0000)]
Merge "Add enter/exit animation for window provided CAB" into mnc-dev
Doris Liu [Tue, 23 Jun 2015 01:33:52 +0000 (18:33 -0700)]
Add enter/exit animation for window provided CAB
Bug:
21886856
Change-Id: I6b20901c51ce7d74058f6ef866334f622a1fa3a4