OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Do not save TextView text when freezesText is false" into nyc-dev
Siyamed Sinir [Mon, 8 Feb 2016 22:51:31 +0000 (22:51 +0000)]
Merge "Do not save TextView text when freezesText is false" into nyc-dev

8 years agoMerge "Fix TextDropShadowCacheTests and glyph_t everywhere" into nyc-dev
Chris Craik [Mon, 8 Feb 2016 22:47:34 +0000 (22:47 +0000)]
Merge "Fix TextDropShadowCacheTests and glyph_t everywhere" into nyc-dev

8 years agoMerge "Use clang to build microbench" into nyc-dev
Chris Craik [Mon, 8 Feb 2016 22:46:52 +0000 (22:46 +0000)]
Merge "Use clang to build microbench" into nyc-dev

8 years agoMerge "Fix drawing cache on sw drawing" into nyc-dev
John Reck [Mon, 8 Feb 2016 22:46:09 +0000 (22:46 +0000)]
Merge "Fix drawing cache on sw drawing" into nyc-dev

8 years agoFix TextDropShadowCacheTests and glyph_t everywhere
Chris Craik [Sat, 6 Feb 2016 04:10:50 +0000 (20:10 -0800)]
Fix TextDropShadowCacheTests and glyph_t everywhere

Change-Id: I943eae4e9408c77bdfba6304ba7ee3e862351a41

8 years agoUse clang to build microbench
Chris Craik [Sat, 6 Feb 2016 02:03:36 +0000 (18:03 -0800)]
Use clang to build microbench

Change-Id: I7ae8049fe05e99fadf905abd18553cb28596ba7f

8 years agoMerge "Hidden permissions to access blocked numbers." into nyc-dev
Abhijith Shastry [Mon, 8 Feb 2016 22:40:35 +0000 (22:40 +0000)]
Merge "Hidden permissions to access blocked numbers." into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 22:33:00 +0000 (22:33 +0000)]
Import translations. DO NOT MERGE
am: ac534a6c82  -s ours

* commit 'ac534a6c8282f2669bbd5e30836f43d2bfdd5b3d':
  Import translations. DO NOT MERGE

8 years agoDo not save TextView text when freezesText is false
Siyamed Sinir [Sat, 6 Feb 2016 00:08:59 +0000 (16:08 -0800)]
Do not save TextView text when freezesText is false

Currently TextView state is saved whenever selection is set even if
freezesText is false. This causes inconsistencies with the described
behavior for the attribute. This CL updates the behavior as:
- Always save the text for EditText
- Always save the selection if there are any.
- Do not save the text for TextView if freezesText is false.
- During onRestoreInstanceState if selection is out of the text
  boundaries, do not restore the selection.

Bug: 22076905
Change-Id: I5e05d343e752a7d106c8881993e4d95ae21a38ce
(cherry picked from commit 8535836673c801effce097c54f55814ef88448e7)

8 years agoMake permission RECEIVE_EMERGENCY_BROADCAST public.
Amit Mahajan [Fri, 5 Feb 2016 02:08:30 +0000 (18:08 -0800)]
Make permission RECEIVE_EMERGENCY_BROADCAST public.

It is required to receive intent SMS_EMERGENCY_CB_RECEIVED_ACTION
which is already public.

Bug: 24914029
Change-Id: I2d5461fcedb2cb347c818ab6f94577008f6af242
(cherry picked from commit 45d9b36fc6a609893022b812084987cda3e3717d)

8 years agoHidden permissions to access blocked numbers.
Abhijith Shastry [Sat, 6 Feb 2016 02:28:15 +0000 (18:28 -0800)]
Hidden permissions to access blocked numbers.

BUG: 26232372
Change-Id: I213622ef4623dadcf56745798fb3452c57fa4bd5

8 years agoFix drawing cache on sw drawing
John Reck [Mon, 8 Feb 2016 22:13:06 +0000 (14:13 -0800)]
Fix drawing cache on sw drawing

Bug: 26644517
Change-Id: Ie087a05e1dbab75040ca39e0c43df985f8afed3e

8 years agoMerge "Add system APIs for A/B update." into nyc-dev
Tao Bao [Mon, 8 Feb 2016 22:07:04 +0000 (22:07 +0000)]
Merge "Add system APIs for A/B update." into nyc-dev

8 years agoMerge "Password security for FBE disk encryption keys" into nyc-dev
Paul Crowley [Mon, 8 Feb 2016 21:45:45 +0000 (21:45 +0000)]
Merge "Password security for FBE disk encryption keys" into nyc-dev

8 years agoFixed issue with drag resize state when animating pinned stack.
Wale Ogunwale [Sat, 6 Feb 2016 06:51:01 +0000 (22:51 -0800)]
Fixed issue with drag resize state when animating pinned stack.

When animating the pinned stack, we set drag resizing on the top
most task in the stack. This has a couple of issues.
- Only the top most task is put in drag sizing mode and all other
task in the stack will not be in resizing mode.
- The top most task of the stack can change during the animation,
so we fail to clear the drag resize flag on the previous top task.

We now track drag sizing at the stack level and have the stack
drag resizing state affect its tasks drag resizing states.

Also added concept of continuing a bounds animation if the same
target called BoundsAnimationController.animateBounds before the
current animation is done. We don't send onAnimationEnd() for the
current animation that is been cancelled and don't send
onAnimationStarted() for the animation that will be replacing it.

Bug: 25672053
Change-Id: I64e89ed09d81e4802dacebc5818dfa1deb0d588f

8 years agoDo not update Record.visible if not setting visibility
Jorim Jaggi [Fri, 5 Feb 2016 20:41:17 +0000 (12:41 -0800)]
Do not update Record.visible if not setting visibility

In resumeTopActivityInnerLocked we only update the visibility
if not already visible, to avoid a black flicker. However, in the
interaction when docking a task from recents, makeVisible was
called but the conditions weren't met to make it actually visible,
but Record.visible was still set, leading that we didn't call
WM.setAppVisibility in resumeTopActivityInnerLocked

Bug: 27041808
Change-Id: I400470a5b31881542fedd3edb6a97e524666a8a3

8 years agoMulti-window optimizations #3
Jorim Jaggi [Fri, 5 Feb 2016 22:26:16 +0000 (14:26 -0800)]
Multi-window optimizations #3

- Make sure divider is pushing frames only if necessary
- When starting recents while docking, make sure no unnecessary
animations are played to reduce system load.

Change-Id: I536f009aef7282ed85dde79b853aeae62644f3e3

8 years agoMulti-window optimizations #2
Jorim Jaggi [Fri, 5 Feb 2016 03:49:28 +0000 (19:49 -0800)]
Multi-window optimizations #2

- Do not relaunch activities in stacks that are not visible during
resize.

Change-Id: Ia6bd17882c17db045450a466ba5347ce53e9b837

8 years agoMulti-window optimizations #1
Jorim Jaggi [Fri, 5 Feb 2016 03:34:00 +0000 (19:34 -0800)]
Multi-window optimizations #1

- When the window doesn't have a surface, do not add it to
mResizingWindows, so we don't report unnecessary resizes
- computeDragResizing => false when window is not visible, so we
never enter resizing mode even if the window decides to relayout
in the background

Change-Id: I8e6cdef86f1579d128973d4f2f12e87bf9b65524

8 years agoFix disappearing translucent status bar background
Jorim Jaggi [Fri, 5 Feb 2016 02:34:50 +0000 (18:34 -0800)]
Fix disappearing translucent status bar background

When relaunching an activity while preserving the window, the content
view was put on top of the status bar background, making it disappear
in case of translucent status bar backgrounds.

Change-Id: I1edff29c10616bf5386e982d7336327135f0f7a0

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 21:14:32 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 21:10:39 +0000 (13:10 -0800)]
Import translations. DO NOT MERGE

Change-Id: I477868c67814a6bd353474266dbff375d3b26b4c
Auto-generated-cl: translation import

8 years agoEnsure surfaces stay alive until activity stop.
Robert Carr [Wed, 3 Feb 2016 06:43:27 +0000 (22:43 -0800)]
Ensure surfaces stay alive until activity stop.

Prior to this commit in this case of activity pause, with finishing=true
the activity manager will notify us of app visibility and we will begin
an exit animation. When this exit animation finishes, we will destroy
the application surface (unless its eligible for saving). However there
are two cases where this breaks down:

1. The exit animation finishes before the activity thread handles
the stop transition. Many activities stop rendering on Pause
but many do not and it is totally legal to do so. Sometimes this
results in non fatal dequeue buffer errors and sometimes results in
fatal errors with Pixel Buffers, etc...
2. We may resume the activity shortly after asking the window manager
to pause it. If the window wasn't eligible for animation, we will
immediately destroy it after being told of the visibility change
following PAUSE_FINISHING. It's possible for this to complete
before we process the resume. On the other hand the client
happilly processes the resume and transitions back from PAUSE
and then crashes once it attempts to use it's surface.

In this commit we have the activity manager notify the window manager
when an application has actually finished (or we have timed out
waiting). For windows which have not been explicitly removed by the
client, we defer destruction until we have received both this signal
and the animation has completed.

Bug: 26793431
Change-Id: Ib6ee8fbdd1f03450fbbfd62468a19e97774befab

8 years agoFix Fade transition interrupt.
George Mount [Thu, 4 Feb 2016 23:24:30 +0000 (15:24 -0800)]
Fix Fade transition interrupt.

Bug 26963113

When a Fade transition is interrupted and reversed, the
View started the animation from the beginning. This change
captures the previous transitionAlpha and starts the animation
from the previous alpha state.

Change-Id: I801fe9ade6af4cf8446838e231bdc71841668a18
(cherry picked from commit 3cf9fa3db0231d035142c27992818d8f7827ac3e)

8 years agoMerge "Move graphics and JIT caches to DE storage." into nyc-dev
Jeff Sharkey [Mon, 8 Feb 2016 19:47:20 +0000 (19:47 +0000)]
Merge "Move graphics and JIT caches to DE storage." into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 19:25:33 +0000 (19:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMove graphics and JIT caches to DE storage.
Jeff Sharkey [Mon, 8 Feb 2016 19:16:00 +0000 (12:16 -0700)]
Move graphics and JIT caches to DE storage.

We confirmed with the graphics and JIT teams that no sensitive
user data is written to these caches, so they're safe to point at DE
storage.

Since we don't have control over what is written by the app, we need
to keep the cache environment variable pointing at CE storage.

Fix ensurePrivateDirExists() to always return a path, instead of
returning null which can cause scary bugs.

Change packages.list to no longer canonicalize data paths, since
these fail when CE storage is still locked.

Bug: 27069522
Change-Id: Ifff64a036fa4aa1e61aa0dd98486bc711fbf8f4a

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 19:22:17 +0000 (11:22 -0800)]
Import translations. DO NOT MERGE

Change-Id: I14edb5a78192ca001f700de6dcc57c1c55b528fc
Auto-generated-cl: translation import

8 years agoPermit setRetainInstance(true) on nested fragments, framework edition
Adam Powell [Fri, 5 Feb 2016 00:20:37 +0000 (16:20 -0800)]
Permit setRetainInstance(true) on nested fragments, framework edition

Save arbitrarily nested fragments across config changes as
nonconfiguration objects. This permits the use of retain-instance
child fragments as arbitrary opaque dependencies within other
fragments.

Change-Id: Ia6640b76cfcf7ec28ba252628957a0c14863e957
(cherry picked from commit 7466be66263d5ebffb786ea402d9ed6e36c254f0)

8 years agoFragmentTransaction.commitNow, framework edition
Adam Powell [Thu, 4 Feb 2016 23:38:20 +0000 (15:38 -0800)]
FragmentTransaction.commitNow, framework edition

Offer commitNow and commitNowAllowingStateLoss methods on Fragment for
use by encapsulated components using fragments as implementation
details. This can help prevent unexpected ordering side effects at the
app level when a call to a library method wants to commit and
immediately initialize a fragment as an implementation detail.

Note that this change still does not permit reentrant FragmentManager
operations. It is still an error to add/remove/change fragments in the
same FragmentManager while a fragment transaction is being executed.

Have the commonly used ViewPager adapters use commitNow instead of
executePendingTransactions.

Change-Id: Ia37a871234a287423063f0c2c3e4c93d69116cad
(cherry picked from commit f6b30662f87f7339d0d3946dcf71e930c2fead9b)

8 years agoPreserve compatibility for ViewGroup#showContextMenuForChild
Adam Powell [Fri, 5 Feb 2016 23:52:02 +0000 (15:52 -0800)]
Preserve compatibility for ViewGroup#showContextMenuForChild

Have the new showContextMenuForChild(View, float, float) call through
to the old showContextMenuForChild(View) before recursing up to its
parent. This ensures that existing apps with custom views that
override the old method still get called as expected if they implement
custom behavior.

Unlike some other similar circumstances we aren't implementing this to
be bidirectional as the new behavior doesn't need to be triggered by
invoking the old. If the older method is invoked explicitly we will
still show old-style dialog context menus instead of the newer popup
style since we won't have a good place to visually anchor a popup.

Bug 26919262

Change-Id: Ie09f922d322b5a24789c7867820c4bc43824c385
(cherry picked from commit 759a4c54004af6ac9f42c9c42496a5eb73c461ff)

8 years agoMerge "Clarify synchronization between PrintActivity and RemotePrintDocument" into...
Philip P. Moltmann [Mon, 8 Feb 2016 18:41:55 +0000 (18:41 +0000)]
Merge "Clarify synchronization between PrintActivity and RemotePrintDocument" into nyc-dev

8 years agoAdd system APIs for A/B update.
Tao Bao [Mon, 8 Feb 2016 17:51:38 +0000 (09:51 -0800)]
Add system APIs for A/B update.

Add android.os.UpdateEngine and UpdateEngineCallback classes that
communicate with the update engine via binder APIs for A/B update.

Bug: 26695366
Change-Id: I2471858d28df5443bc0b56d9a20281ccebde4484

8 years agoTIF: Update the internal input list with new TvInputInfo
Jae Seo [Fri, 29 Jan 2016 03:13:04 +0000 (19:13 -0800)]
TIF: Update the internal input list with new TvInputInfo

Bug: 26864151, Bug: 26863281
Change-Id: I33e357aac74bceda50c794eb6057c363de9250b8
(cherry picked from commit 89a9937927e05a86938aa297a79047ce1a7c7d2d)

8 years agoMerge "Replaced 'touch' by 'tap'." into nyc-dev
Felipe Leme [Mon, 8 Feb 2016 18:10:18 +0000 (18:10 +0000)]
Merge "Replaced 'touch' by 'tap'." into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 18:09:21 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 17:54:37 +0000 (23:24 +0530)]
Import translations. DO NOT MERGE

Change-Id: I5c2b346ce87737f9e8077f014d52e0e908a43418
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 17:49:22 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoReplaced 'touch' by 'tap'.
Felipe Leme [Mon, 8 Feb 2016 17:42:52 +0000 (09:42 -0800)]
Replaced 'touch' by 'tap'.

BUG: 26884266
Change-Id: Ic3d7be8a10b768101b161644e46c92cd872621db

8 years agoClarify synchronization between PrintActivity and RemotePrintDocument
Philip P. Moltmann [Wed, 3 Feb 2016 19:03:16 +0000 (11:03 -0800)]
Clarify synchronization between PrintActivity and RemotePrintDocument

The general theme of these changes is to always delay any action until
the printDocument finishes a command. This is done:
- Before callinng for into a different activity to select a name for the
  PDF
- Before finishing

The second theme is to fix the canceling behavior of
RemotePrintDocument.AsyncCommand.

There are four bugs fixed in this review:

(1)
When the RemotePrintDocument.AsyncCommand is canceled it goes into the
"canceling" state. When it is canceled again it should stay in this
state. Before it went to "canceled" but the command was still running.
(see AsyncCommand#cancel()).

(2)
When finishing the PrintActivity in PrintActivity.doFinish() we cancel
the RemotePrintDocument. If there is a command still in progress (i.e.
isUpdating()) and it finished as canceled we used to call doFinish()
again and then try to double-clean up which lead to exceptions.

The new behavior is that is the PrintActivity is calling doFinish()
while a command is still in progress (i.e. isUpdating()) we delay the
cleanup until the command finishes. The command might finish as
canceled, completed or failed. Hence we have to call doFinish() in the
callbacks for all three cases.

(3)
When canceling there might have still been a nextCommand ready, hence
canceling does not stop execution of the RemotePrintDocument which could
lead to running commands while finshing.

(4)
When getting the location to store the PDF at a command might still be
in progress. This lead to half executed commands and caused issues once
we try to continue after the select-location-activity returns

Bug: 24713704
Bug: 24973884
Change-Id: Ied90fe8dc9bd6ea7f8b3e4ce4f922e477015568d

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 17:22:34 +0000 (22:52 +0530)]
Import translations. DO NOT MERGE

Change-Id: Ic6f472559385699038b2d8f5e63d2ed0d5752c4d
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 16:46:58 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 16:46:31 +0000 (22:16 +0530)]
Import translations. DO NOT MERGE

Change-Id: I2fd0cda2b14b49646e59253e874cef28e84a5c2f
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 16:37:32 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 16:32:25 +0000 (17:32 +0100)]
Import translations. DO NOT MERGE

Change-Id: I4bf4fefbe2f02647922208fafaa23f70c2fe965a
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 16:28:20 +0000 (21:58 +0530)]
Import translations. DO NOT MERGE

Change-Id: I70b1edaa1374eb469b691b3dc599f92d94762638
Auto-generated-cl: translation import

8 years agoMerge "Update DND visual interruption choices." into nyc-dev
Julia Reynolds [Mon, 8 Feb 2016 16:10:23 +0000 (16:10 +0000)]
Merge "Update DND visual interruption choices." into nyc-dev

8 years agoPassword security for FBE disk encryption keys
Paul Crowley [Mon, 8 Feb 2016 15:58:29 +0000 (15:58 +0000)]
Password security for FBE disk encryption keys

Add the means to protect FBE keys with a combination of an auth token
from Gatekeeper, and a hash of the password. Both of these must be
passed to unlock_user_key. Keys are created unprotected, and
change_user_key changes the way they are protected.

Bug: 22950892
Change-Id: Ie13bc6f82059ce941b0e664a5b60355e52b45f30

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 8 Feb 2016 15:54:22 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 15:52:49 +0000 (10:52 -0500)]
Import translations. DO NOT MERGE

Change-Id: Ibace3035d3275c1fdbb39cd3769844dfaef35d00
Auto-generated-cl: translation import

8 years agoUpdate DND visual interruption choices.
Julia Reynolds [Fri, 5 Feb 2016 20:25:58 +0000 (15:25 -0500)]
Update DND visual interruption choices.

Change-Id: I7050264839c566dcef1dd01d155dda694a8d1ec0

8 years agoAdd support for auto-adding tiles
Jason Monk [Fri, 5 Feb 2016 17:33:13 +0000 (12:33 -0500)]
Add support for auto-adding tiles

hotspot, color inversion, data saver, and work profiles should add
themselves when they first become applicable.

Also refactor the availability flow a little bit.

Change-Id: Iaed89059540a98fefd4d26ce69edc0dde987b992

8 years agoSettings drawer work
Jason Monk [Fri, 5 Feb 2016 15:16:22 +0000 (10:16 -0500)]
Settings drawer work

 - Final visuals
 - Show under status bar
 - Fix activity flow surrounding drawer use

Change-Id: I161702219c26cabc6b2d1adbaa6fbfb1d9fd5b07

8 years agoMerge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev
Nicolas Prévot [Mon, 8 Feb 2016 14:08:20 +0000 (14:08 +0000)]
Merge "Fail if setProfileEnabled is called outside a managed profile." into nyc-dev

8 years agoFail if setProfileEnabled is called outside a managed profile.
Nicolas Prevot [Fri, 5 Feb 2016 11:52:22 +0000 (11:52 +0000)]
Fail if setProfileEnabled is called outside a managed profile.

BUG:26709495
Change-Id: I98adf2dab1e7b27fef926144c460af8823fe96e7

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 8 Feb 2016 14:02:38 +0000 (09:02 -0500)]
Import translations. DO NOT MERGE

Change-Id: I7356ebc23a9842b6594df301f204d79dfcd97bca
Auto-generated-cl: translation import

8 years agoFix FrameworksServicesTests.apk to include libc++.so
Paul Jensen [Mon, 8 Feb 2016 11:41:25 +0000 (11:41 +0000)]
Fix FrameworksServicesTests.apk to include libc++.so
am: 5f3dec374f

* commit '5f3dec374fac97365ec95ec407a1cffc2c3907c9':
  Fix FrameworksServicesTests.apk to include libc++.so

8 years agoFix FrameworksServicesTests.apk to include libc++.so
Paul Jensen [Mon, 8 Feb 2016 02:55:45 +0000 (21:55 -0500)]
Fix FrameworksServicesTests.apk to include libc++.so

libc++.so is no longer accessible to the app, so it must be
bundled in the app. This should get ApfTest passing again.

Change-Id: Ide004cb84f7f50feffb8f5acb46b7001dcffd208

8 years agoAnother intent sent by both system and apps.
Jeff Sharkey [Sun, 7 Feb 2016 19:51:31 +0000 (12:51 -0700)]
Another intent sent by both system and apps.

Bug: 26219772
Change-Id: I4e52c6836e65b983800ef59ad7a1ade5b3a2bea2

8 years agoMerge "Migrate default app data on non-FBE devices."
Jeff Sharkey [Sun, 7 Feb 2016 03:57:32 +0000 (03:57 +0000)]
Merge "Migrate default app data on non-FBE devices."

8 years agoMigrate default app data on non-FBE devices.
Jeff Sharkey [Sun, 7 Feb 2016 02:46:15 +0000 (19:46 -0700)]
Migrate default app data on non-FBE devices.

When a system app requests "forceDeviceEncrypted" they expect their
default app storage to point at a consistent location regardless of
device FBE support.  So when booting upgraded non-FBE devices, we
may need to migrate any data from CE to DE.  Note that on non-FBE
devices these are just semantic locations with identical protection.

This migration *only* works for non-FBE devices; changing
forceDeviceEncrypted flags on an FBE device always requires a full
data wipe.

Bug: 26668510
Change-Id: Ic5dfeaaf2db26c385901a638ca8ec35eb3c52859

8 years agoMerge "UsageStatsBackup Bug Fix"
Ritesh Reddy [Sat, 6 Feb 2016 19:42:14 +0000 (19:42 +0000)]
Merge "UsageStatsBackup Bug Fix"

8 years agoMerge "Add flag to "am start" to enable native debugging"
Tamas Berghammer [Sat, 6 Feb 2016 13:18:58 +0000 (13:18 +0000)]
Merge "Add flag to "am start" to enable native debugging"

8 years agoMerge "Always get an auth token when we verify."
Paul Crowley [Sat, 6 Feb 2016 08:43:28 +0000 (08:43 +0000)]
Merge "Always get an auth token when we verify."

8 years agoFix build
Chris Craik [Sat, 6 Feb 2016 02:17:35 +0000 (18:17 -0800)]
Fix build

Change-Id: I1ad30ae50cbdff9267d0121a446e6adbe3ad17ee

8 years agoMerge "Hotspot 2.0 release 2 client app."
Jan Nordqvist [Sat, 6 Feb 2016 01:40:13 +0000 (01:40 +0000)]
Merge "Hotspot 2.0 release 2 client app."

8 years agoMerge "Move several property queries to Properties class"
Chris Craik [Sat, 6 Feb 2016 01:39:34 +0000 (01:39 +0000)]
Merge "Move several property queries to Properties class"

8 years agoMove several property queries to Properties class
Chris Craik [Fri, 5 Feb 2016 23:59:29 +0000 (15:59 -0800)]
Move several property queries to Properties class

bug:17478770

This removes a lot of redundant property query code, and puts the
queries all in one place, so defining them automatically will be simpler
in the future.

Change-Id: I0428550e6081f07bc6554ffdf73b22284325abb8

8 years agoHotspot 2.0 release 2 client app.
Jan Nordqvist [Fri, 5 Feb 2016 23:30:26 +0000 (15:30 -0800)]
Hotspot 2.0 release 2 client app.

Change-Id: Ic8f93a3c9fede3f25c03b0153826ac5c49771b60

8 years agoMerge "Track BLE scans in BatteryStats"
Adam Lesinski [Sat, 6 Feb 2016 00:52:38 +0000 (00:52 +0000)]
Merge "Track BLE scans in BatteryStats"

8 years agoMerge "Use the right ClassLoader when restoring."
Jeff Sharkey [Sat, 6 Feb 2016 00:15:41 +0000 (00:15 +0000)]
Merge "Use the right ClassLoader when restoring."

8 years agoUse the right ClassLoader when restoring.
Jeff Sharkey [Sat, 6 Feb 2016 00:13:16 +0000 (17:13 -0700)]
Use the right ClassLoader when restoring.

If we're restoring after a background process death, the Parcelable
creator cache is cold, and since we're handing in a null ClassLoader
the best the platform can do is try the default ClassLoader which
knows nothing about the running app.

That's why ClassLoaderCreator exists, so use it to snag the relevant
ClassLoader and pass it along.

Bug: 26075620
Change-Id: I6fd977d6178dd0f5f9c465597f5806a08097ac7c

8 years agoresolve merge conflicts of 9ea5295597 to master.
John Reck [Fri, 5 Feb 2016 23:59:55 +0000 (15:59 -0800)]
resolve merge conflicts of 9ea5295597 to master.

Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50

8 years agoMerge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
John Reck [Fri, 5 Feb 2016 23:52:12 +0000 (23:52 +0000)]
Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
am: 857b65657d

* commit '857b65657d453801e9b73f998043603456dac813':
  libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case

8 years agoMerge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"
John Reck [Fri, 5 Feb 2016 23:38:10 +0000 (23:38 +0000)]
Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"

8 years agoMerge "Check wallpaper visibility to determine if wallpaper is obscuring apps."
Chong Zhang [Fri, 5 Feb 2016 23:32:56 +0000 (23:32 +0000)]
Merge "Check wallpaper visibility to determine if wallpaper is obscuring apps."

8 years agoMerge "Tweaks to file:// Uri StrictMode checks."
Jeff Sharkey [Fri, 5 Feb 2016 23:21:29 +0000 (23:21 +0000)]
Merge "Tweaks to file:// Uri StrictMode checks."

8 years agoTweaks to file:// Uri StrictMode checks.
Jeff Sharkey [Fri, 5 Feb 2016 23:19:10 +0000 (16:19 -0700)]
Tweaks to file:// Uri StrictMode checks.

Whitelist two more legacy intent actions, and don't enforce the
StrictMode checks when resolving intents that might be coming from
legacy apps.  Newer apps would have already been yelled at directly
before getting to the resolver.

Bug: 2697651626977622
Change-Id: Ibf72a361ed68c52cfaac16c32ab40e79005a42e7

8 years agoMerge "Carrier config to support overriding block suppress duration after emergency...
Abhijith Shastry [Fri, 5 Feb 2016 23:08:28 +0000 (23:08 +0000)]
Merge "Carrier config to support overriding block suppress duration after emergency contact."

8 years agoCarrier config to support overriding block suppress duration after emergency contact.
Abhijith Shastry [Fri, 5 Feb 2016 01:28:03 +0000 (17:28 -0800)]
Carrier config to support overriding block suppress duration after emergency contact.

BUG: 26989170
Change-Id: I6d8f13dd4f2b69730826cc8440a22c7154255ac8

8 years agoCheck wallpaper visibility to determine if wallpaper is obscuring apps.
Chong Zhang [Fri, 5 Feb 2016 22:42:36 +0000 (14:42 -0800)]
Check wallpaper visibility to determine if wallpaper is obscuring apps.

bug: 26948569
Change-Id: I710893ee086dce441cb5e2744fc721d3e1a2fd8a

8 years agoMerge "Fix typo in KeyInfo Javadoc." am: e8fbc20e12
Alex Klyubin [Fri, 5 Feb 2016 22:37:31 +0000 (22:37 +0000)]
Merge "Fix typo in KeyInfo Javadoc." am: e8fbc20e12
am: b21416e287

* commit 'b21416e2875973706d8b922428225194d9625875':
  Fix typo in KeyInfo Javadoc.

8 years agoMerge "Fix typo in KeyInfo Javadoc."
Alex Klyubin [Fri, 5 Feb 2016 22:33:09 +0000 (22:33 +0000)]
Merge "Fix typo in KeyInfo Javadoc."
am: e8fbc20e12

* commit 'e8fbc20e12da685acddffc01c41ccf134f051ce9':
  Fix typo in KeyInfo Javadoc.

8 years agoMerge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix"
Jean-Michel Trivi [Fri, 5 Feb 2016 22:27:25 +0000 (22:27 +0000)]
Merge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix"

8 years agoMerge "Fix typo in KeyInfo Javadoc."
Alex Klyubin [Fri, 5 Feb 2016 22:26:56 +0000 (22:26 +0000)]
Merge "Fix typo in KeyInfo Javadoc."

8 years agoMerge "Fix GridView isHeading computation"
Steven Dao [Fri, 5 Feb 2016 22:23:53 +0000 (22:23 +0000)]
Merge "Fix GridView isHeading computation"

8 years agoMerge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
Tyler Gunn [Fri, 5 Feb 2016 22:18:26 +0000 (22:18 +0000)]
Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
am: 6c4aac0bde

* commit '6c4aac0bdee2678818f577490c4acfdeeba81c59':
  IMS: Constants For Audio Quality, Supp. Services

8 years agoFix typo in KeyInfo Javadoc.
Alex Klyubin [Fri, 5 Feb 2016 22:18:19 +0000 (14:18 -0800)]
Fix typo in KeyInfo Javadoc.

Change-Id: I801005a93aee71b93b3d6cf3f7c38361493ff203

8 years agoMerge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev
Tyler Gunn [Fri, 5 Feb 2016 22:13:32 +0000 (22:13 +0000)]
Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev

8 years agoFix GridView isHeading computation
Steven Dao [Fri, 5 Feb 2016 21:51:55 +0000 (13:51 -0800)]
Fix GridView isHeading computation

- Same issue that was previously in the ListView

Change-Id: I3a3105b46bdadc43ea679b4d29d0719a67c291bc

8 years agohwui: set buffer destroyed swap mode explicitly
Christian Poetzsch [Fri, 5 Feb 2016 14:22:01 +0000 (14:22 +0000)]
hwui: set buffer destroyed swap mode explicitly

Not using EGL_SWAP_BEHAVIOR_PRESERVED_BIT as config attribute for
eglChooseConfig doesn't automatically mean the swap behavior is buffer
destroyed. This is driver implementation specific and on some hw this
can still be buffer preserved. Make sure it is buffer destroyed by
explicitly setting it for every new surface when requested.

Change-Id: Ie2c7c89b0d20e35832b488c6263bb4d9dd844a75
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
8 years agoMerge "Add a debug assert to track down infinite loop"
John Reck [Fri, 5 Feb 2016 21:40:14 +0000 (21:40 +0000)]
Merge "Add a debug assert to track down infinite loop"

8 years agoMerge "Ref count the nodes in VectorDrawable"
Doris Liu [Fri, 5 Feb 2016 21:31:23 +0000 (21:31 +0000)]
Merge "Ref count the nodes in VectorDrawable"

8 years agoMerge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY"""
Doris Liu [Fri, 5 Feb 2016 21:31:05 +0000 (21:31 +0000)]
Merge "Revert "Revert "VectorDrawable native rendering - Step 4 of MANY"""

8 years agoMerge "Prevent NPE in ContactsContract"
Makoto Onuki [Fri, 5 Feb 2016 21:30:38 +0000 (21:30 +0000)]
Merge "Prevent NPE in ContactsContract"

8 years agoPrevent NPE in ContactsContract
Makoto Onuki [Fri, 5 Feb 2016 21:23:21 +0000 (13:23 -0800)]
Prevent NPE in ContactsContract

Bug 26730982

Change-Id: I36fdfffba79e0696175edd42bb131f92cba47499

8 years agoMerge "Fix potential crash when getSensorList returns error"
Peng Xu [Fri, 5 Feb 2016 21:07:22 +0000 (21:07 +0000)]
Merge "Fix potential crash when getSensorList returns error"

8 years agoMerge "Fix some battery icon issues"
Jason Monk [Fri, 5 Feb 2016 21:07:14 +0000 (21:07 +0000)]
Merge "Fix some battery icon issues"

8 years agoFix potential crash when getSensorList returns error
Peng Xu [Fri, 5 Feb 2016 06:27:20 +0000 (22:27 -0800)]
Fix potential crash when getSensorList returns error

bug: b/19937981

Change-Id: Ibfb8c625609923b4e60fa73685dbeb10944ab2b9

8 years agoAdd a debug assert to track down infinite loop
John Reck [Fri, 5 Feb 2016 21:03:47 +0000 (13:03 -0800)]
Add a debug assert to track down infinite loop

Bug: 26980851
Change-Id: I326983ab367782048311b6cf06d800f72837e38e