OSDN Git Service

android-x86/frameworks-base.git
7 years agodocs: Typo fix in multi-window docs
Andrew Solovay [Mon, 29 Aug 2016 18:48:50 +0000 (11:48 -0700)]
docs: Typo fix in multi-window docs

Referred to the "android:resizableActivity" property; should
have been "android:resizeableactivity". English prose, however,
consistently uses the (preferred) spelling "resizable".

See first comment for stage location.

bug: 30566808
Change-Id: I2570ff9269b4d2dc8b11f1c98817e50726be78fc

7 years agoMerge "docs: Fixing formatting problem" into nyc-dev
Andrew Solovay [Thu, 1 Sep 2016 02:21:46 +0000 (02:21 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev

7 years agodocs: fixing gpu debugger redirect
Cheryl Potter [Thu, 1 Sep 2016 00:43:37 +0000 (17:43 -0700)]
docs: fixing gpu debugger redirect
b/31227713

Change-Id: Ia0e7e4d26940dc98ab735df3068dc2dda22b1f58

7 years agodocs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more)
Cheryl Potter [Wed, 31 Aug 2016 21:31:50 +0000 (14:31 -0700)]
docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more)
b/31158856
b/31157097
b/31158502

Change-Id: Id3178127e0267936c58f47cd7da7348202051fa3

7 years agoMerge "Properly close fd backing a MemoryIntArray" into nyc-dev
Svetoslav Ganov [Wed, 31 Aug 2016 17:25:28 +0000 (17:25 +0000)]
Merge "Properly close fd backing a MemoryIntArray" into nyc-dev

7 years agoProperly close fd backing a MemoryIntArray
Svetoslav Ganov [Mon, 29 Aug 2016 18:14:05 +0000 (11:14 -0700)]
Properly close fd backing a MemoryIntArray

Use ParcelFileDescriptor only as an IPC transport
to make sure MemoryIntArray manges its backing fd.

Bug:30310689

Change-Id: Ib3cc13ef4ae2a744e5f7a96099570e0431847bce
(cherry picked from commit fe2462f3a60b34ee6b7d8764d92ae58fc0cd7dfd)

7 years agoMerge "replace the N Preview landing page with the redirect to the package index...
Scott Main [Wed, 31 Aug 2016 03:06:08 +0000 (03:06 +0000)]
Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev

7 years agoRevert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failur...
Adam Seaton [Tue, 30 Aug 2016 23:15:49 +0000 (23:15 +0000)]
Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded.
am: b57e6560d0

Change-Id: Idaafcb7c835aa7b7b83bb7382900ef3d18fa551f

7 years agoMerge "Backup system QS tiles DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 30 Aug 2016 22:30:15 +0000 (22:30 +0000)]
Merge "Backup system QS tiles DO NOT MERGE" into nyc-dev

7 years agoRevert "Bump up the uncrypt timeout to 30 min."
Adam Seaton [Tue, 30 Aug 2016 22:14:47 +0000 (22:14 +0000)]
Revert "Bump up the uncrypt timeout to 30 min."
Creates Null Build to test OTA failure fix.
This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded.

Change-Id: I64474dad467ce8d8e379e0e2c47814d76ac0ee0d

7 years agoreplace the N Preview landing page with the redirect to the package index
smain@google.com [Tue, 30 Aug 2016 01:36:50 +0000 (18:36 -0700)]
replace the N Preview landing page with the redirect to the package index
also update version metadata (no longer preview, now 7.0)

Change-Id: I84af003daa9bae3bc932c8b87921ed82f813e1cf

7 years agoBackup system QS tiles DO NOT MERGE
Jason Monk [Thu, 25 Aug 2016 19:57:14 +0000 (15:57 -0400)]
Backup system QS tiles DO NOT MERGE

Add QS tiles to the backup list.  Non-system tiles will get removed
since they won't be installed when restore happens.

Change-Id: Iccf6e773384c45bd4d1f10c21aa8af356b3920d2
Bug: 28782938

7 years agoMerge "docs: Fix broken camera example" into nyc-dev
Mark Goldstein [Tue, 30 Aug 2016 18:34:21 +0000 (18:34 +0000)]
Merge "docs: Fix broken camera example" into nyc-dev

7 years agoMerge "add a notice that Work profiles are not compatible with Instant Run Also inclu...
Scott Main [Tue, 30 Aug 2016 18:09:03 +0000 (18:09 +0000)]
Merge "add a notice that Work profiles are not compatible with Instant Run Also includes the redirect for links from the Studio UI bug: 31098748" into nyc-dev

7 years agoMerge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
Raph Levien [Tue, 30 Aug 2016 17:25:55 +0000 (17:25 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev

7 years agoMerge "Sanity check ICMP6 router advertisement packets" into nyc-dev
TreeHugger Robot [Tue, 30 Aug 2016 05:20:10 +0000 (05:20 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-dev

7 years agoSanity check ICMP6 router advertisement packets
Paul Jensen [Wed, 20 Jul 2016 19:01:17 +0000 (15:01 -0400)]
Sanity check ICMP6 router advertisement packets

There is a chance a packet can slip by before we install the filter
on our socket listening for RAs, so add some basic sanity checking
to make sure we've recieved an RA.

Change-Id: I14cf84a0814896a41e00f50af376dfc4988d36cb
Fixes: 29586253

7 years agoMerge "update shared libraries for system apps" into nyc-dev
TreeHugger Robot [Tue, 30 Aug 2016 01:44:29 +0000 (01:44 +0000)]
Merge "update shared libraries for system apps" into nyc-dev

7 years agoMerge "Cherry pick TextureView fixes" into nyc-dev
John Reck [Mon, 29 Aug 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev

7 years agodocs: Fix broken camera example
Mark Goldstein [Fri, 26 Aug 2016 18:29:25 +0000 (11:29 -0700)]
docs: Fix broken camera example

Removed bad out of date instructions and link to better
training pages instead.

Bug: 15562334
Change-Id: I77fe558e665de509eb11a2c668ba7bdcdbab3c6f

7 years agoupdate shared libraries for system apps
Todd Kennedy [Thu, 28 Jul 2016 20:28:16 +0000 (13:28 -0700)]
update shared libraries for system apps

After removing updates for a system package, we weren't updating its
shared libraries when we should have. Make it so.

NOTE: This didn't affect device boot because we update all of the
shared libraries for all system applications after scanning packages.

Bug: 30266503
Change-Id: I8edf4344228fb3e793e7648ea70a041cb5db6af6
(cherry picked from commit 6058df65e645a81bdc7285dcd9f8b12b9f5b534f)

7 years agoMerge "Make sure IME focus is synced to View focus" into nyc-dev
TreeHugger Robot [Mon, 29 Aug 2016 22:35:21 +0000 (22:35 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev

7 years agoMerge "ChooserActivity: Cannot start app that the icon overflows the layout" into...
Chet Haase [Mon, 29 Aug 2016 22:13:09 +0000 (22:13 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev

7 years agoMerge "Set up view state before attaching, jump drawables if needed" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:12:07 +0000 (22:12 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev

7 years agoMerge "Force AlertDialogLayout to have gravity start|top" into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:25 +0000 (22:11 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev

7 years agoMerge "FloatingActionMode: Fix screen coordinates." into nyc-dev
Chet Haase [Mon, 29 Aug 2016 22:11:07 +0000 (22:11 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev

7 years agoMerge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev
TreeHugger Robot [Mon, 29 Aug 2016 21:47:02 +0000 (21:47 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev

7 years agoCherry pick TextureView fixes
Chris Craik [Mon, 25 Jul 2016 22:29:59 +0000 (15:29 -0700)]
Cherry pick TextureView fixes

The following changes are in this commit:

Avoid destroying TextureView surfaces for onStop

bug:30238922

TextureViews will hold onto their backing surfaces, which will allow
them to resume gracefully when the app's surfaces are saved.

Now only resources that are destroyed for onStop are DisplayLists.

(cherry picked from commit 391d560402c2902e0fd701f99eabd91025154201)

TextureView: destroy layer on destroyHardwareResources event

bug:30468770

(cherry picked from commit 1c16c37d8646ed25e844af8472eede988ad0c2f0)

Fix NPE in TextureView

Bug: 30651595

(cherry picked from commit 3c2587f26eed32a8723488131d1d8940dc147ee1)

Fix NPE in TextureView

Bug: 30779663

(cherry picked from commit 7e237189c292cdb886733eb95c6069b7ac002527)

Fix maps resume being blank

Bug: 30889568

Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.

(cherry picked from commit 03df0834e63b587dbfb8fdcd0086e3e1e72b9f9d)

7 years agoMerge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev
TreeHugger Robot [Mon, 29 Aug 2016 21:10:31 +0000 (21:10 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev

7 years agoEliminate next-alarm-clock broadcast flapping
Christopher Tate [Wed, 3 Aug 2016 21:57:47 +0000 (14:57 -0700)]
Eliminate next-alarm-clock broadcast flapping

When multiple alarm clocks are scheduled at the same time, we would
flap among the alternatives for considering them the 'next upcoming
alarm clock', which in turn would generate [many] spurious broadcasts
about changes to the upcoming alarm situation.  This is now fixed;
once we have found the soonest upcoming alarm clock, we stick with
that one until it becomes unavailable, eliminating the spurious
broadcast traffic.

Bug 29501073

Change-Id: Ice1892490bb339e05fa8bd9d324fa1c6718b4942
(cherry picked from commit 76389c00d3d3ce79e48d9e87b597707ed3e8970c)

7 years agoBump up the uncrypt timeout to 30 min.
Tao Bao [Mon, 29 Aug 2016 19:26:43 +0000 (19:26 +0000)]
Bump up the uncrypt timeout to 30 min.
am: 8abcfed8a4

Change-Id: I35340614fe09f96f8c31cc53a99e366580294490

7 years agoDO NOT MERGE -- Fix finishing activity in non-focused stack
Andrii Kulian [Fri, 29 Jul 2016 19:55:41 +0000 (12:55 -0700)]
DO NOT MERGE -- Fix finishing activity in non-focused stack

This CL explicitly checks if we're finishing activity in non-focused
stack as there are other cases except this one when we finish paused
activities in FINISH_AFTER_VISIBLE mode.

Bug: 29007436
Bug: 29458854
Change-Id: I67744d23cd72f2fe8861180008bfdd284a7b5e26
(cherry picked from commit 995fa2bd2d334a37e10760c21ac108f4a3595713)

7 years agoMerge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
Andrii Kulian [Mon, 29 Aug 2016 18:30:06 +0000 (18:30 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev

7 years agoMake sure IME focus is synced to View focus
Yohei Yukawa [Fri, 5 Aug 2016 22:38:55 +0000 (15:38 -0700)]
Make sure IME focus is synced to View focus

This CL fixes an edge case that my previous CL [1] forgot to handle.

The goal of my previous CL was to avoid InputMethodManager from getting
confused by a false focus-in event from temporarily detached Views.
However, my CL forgot to take care of the case where the temporarily
detached View is still focused even after the temporary detach mode is
done.

The bad news is that such a situation is relatively easy to trigger by
having a ListView that has EditText as follows, which seems to be
known to be a common technique in Android developer community to put an
EditText in a ListView.
  ListView#listView.addHeaderView(new EditText(context), null, true);

If the ListView is initialized as above, and the EditText has input
focus, View focus and IME focus start to disagree immediatelly after the
ListView's layout is re-evaluated.  This is really easy to trigger, for
example just by dismissing the IME window.

In summary, the root cause is that InputMethodManager#focusIn(View) is
now always ignored as long as the View is temporarily detached, under an
assumption that IMM#focusIn(View) will be called back again with a View
that is not temporarily detached when everything is stable.  Hence the
fix is to do so by hooking up View#dispatchFinishTemporaryDetach() to
call IMM#focusIn(View) again when the View is actually focused in the
final state.

 [1]: Ia79bbd8468f768d546354382b47b39dd31ef7bb5
      a4ed0cfcb6885beeb52f701bfc64c393b668f7ba

Bug: 30022872
Bug: 30578745
Bug: 30706985
Change-Id: Iecbdb00dcef8c72e4f7b31035c9bf0f4a40a578f
(cherry picked from commit dd228fbb4d2cb3d178ed7f1889343bfe177aafa2)

7 years agoMerge "Fix double status bar icons" into nyc-dev
Jason Monk [Mon, 29 Aug 2016 18:00:00 +0000 (18:00 +0000)]
Merge "Fix double status bar icons" into nyc-dev

7 years agoMerge "Fixed a bug where notifications could reappear" into nyc-dev
TreeHugger Robot [Mon, 29 Aug 2016 17:58:28 +0000 (17:58 +0000)]
Merge "Fixed a bug where notifications could reappear" into nyc-dev

7 years agoFix double status bar icons
Jason Monk [Tue, 26 Jul 2016 17:04:50 +0000 (13:04 -0400)]
Fix double status bar icons

Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController.  Set it in the constructor to enforce
this.

Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes: 28524184
(cherry picked from commit c6fe61c59c5a3a6ae691256c9afdde3820e3dd9e)

7 years agoForce AlertDialogLayout to have gravity start|top
Adam Powell [Thu, 28 Jul 2016 23:30:10 +0000 (16:30 -0700)]
Force AlertDialogLayout to have gravity start|top

AlertDialogLayout overrides LinearLayout#onMeasure but not onLayout,
meaning that some state initialized for the handling of gravity may
not be valid in LinearLayout#onLayout. As this is an internal class
never used directly by apps, explicitly specify the default gravity of
start|top in @layout/alert_dialog_material to avoid this bug. Apps
that do things like set gravity in their theme (for whatever reason)
could otherwise change its behavior.

Bug 30494039

Change-Id: I71a8be1829a7fe24cf7714a3bd5ed732f85eb887
(cherry picked from commit 39e0bf23f50a3de112b232321c5e0a1013af70c7)

7 years agoBump up the uncrypt timeout to 30 min.
Tao Bao [Sat, 27 Aug 2016 03:52:41 +0000 (20:52 -0700)]
Bump up the uncrypt timeout to 30 min.

Bug: 30490464
Change-Id: I9b65afb10134d79b2f5b5275a6d81065a04e91b9

7 years agoChooserActivity: Cannot start app that the icon overflows the layout
Yuichi Biwa [Mon, 30 Nov 2015 05:43:34 +0000 (14:43 +0900)]
ChooserActivity: Cannot start app that the icon overflows the layout

Symptom:
When sharing an image from Album, ChooserActivity can be shown.
But then the app to be located to the bottom part of the list may not
be started even if user tap it.

Root cause:
ChooserActivity uses ResolverDrawerLayout. And ResolverDrawerLayout
can display only some items on the list (known as "Collapse mode").
When the item clipping along the bottom edge is tapped by the user,
ResolverDrawerLayout tries to expand the list and scroll it to a
better position, instead of starting an application.
In this problem case, ResolverDrawerLayout continues to try to expand
the list whenever tapping, so an application will never start.

Solution:
Change a condition so that mOpenOnClick becomes true only when the list
has been collapsed (mCollapseOffset > 0).

Bug: 30153542

Change-Id: I576fb6c8b6a91d79c1e0d46d069146779f4dbd17
(cherry picked from commit 4f3a843ea9b6ffe2e29e6625ffb3d87fbf143623)

7 years agoFloatingActionMode: Fix screen coordinates.
Abodunrinwa Toki [Fri, 15 Jul 2016 13:40:26 +0000 (14:40 +0100)]
FloatingActionMode: Fix screen coordinates.

Use application context to get the screen's display metrics.

Bug: 30127070
Change-Id: I2c453c494ef210c12d89fc7e3ff026728f9ecb0f
(cherry picked from commit afb38c5cc4226ce82367015f4ce52765018226d6)

7 years agoSet up view state before attaching, jump drawables if needed
Alan Viverette [Thu, 7 Jul 2016 20:39:27 +0000 (16:39 -0400)]
Set up view state before attaching, jump drawables if needed

View attachment calls jumpDrawablesToCurrentState(), so the view state
needs to be set up prior to attachment. For views that are already
attached but are being moved to a new position, manually jump.

Cleans up comments in methods that were modified.

Bug: 29978498
Change-Id: Ica27b2c60ad7ee98b9d1e4912c4f8b8c248af88d
(cherry picked from commit 26489e1688633ee270ff1469d0df38c90bbdf674)

7 years agoFixed a bug where notifications could reappear
Selim Cinek [Wed, 20 Jul 2016 20:46:49 +0000 (13:46 -0700)]
Fixed a bug where notifications could reappear

With sensitive notifications a user could get into
a situation where the groupsummary would not be cleared
because its dismissability was never updated and based
on the visibility of the veto button. This is now corrected.

This Cl also cleans up the veto button handling overall and
ensures that there's no stale state arond it.

Change-Id: Ic7df8d382146d7863ee551c1daa8ba5ed384c7b5
Fixes: 30056258
(cherry picked from commit 9e624e732aa5646c83d203587be9c2c4e94c9266)

7 years agoFixed a bug where the headsup would be stuck disappearing
Selim Cinek [Wed, 13 Jul 2016 21:34:56 +0000 (14:34 -0700)]
Fixed a bug where the headsup would be stuck disappearing

Change-Id: I56d6be69f6e59c1bec647e7e70e50a36b793f895
Fixes: 30120962

7 years agoEnforce consistent sizes for arrays in SpannableStringInternal
Raph Levien [Mon, 25 Jul 2016 17:05:35 +0000 (10:05 -0700)]
Enforce consistent sizes for arrays in SpannableStringInternal

The grow logic in SpannableStringInternal#setSpan assumes that the
size of mSpanData is consistent with that of mSpans, in particular
that if the latter doesn't need to grow, neither does the former.
The copySpans() method didn't enforce this, creating an mSpanData
array only big enough to hold the data.

This patch documents the invariant in a comment and enforces it.

Bug: 30359314
Change-Id: Ie25db70a76836e97af8476a7f5c10cb4b976c1cf
(cherry picked from commit 83549088c643586aa6013d947ad2c21464a3878e)

7 years agoadd a notice that Work profiles are not compatible with Instant Run
smain@google.com [Fri, 26 Aug 2016 23:25:24 +0000 (16:25 -0700)]
add a notice that Work profiles are not compatible with Instant Run
Also includes the redirect for links from the Studio UI
bug: 31098748

Change-Id: Ief7296e512ccf387d738426026413dfe19785ff7

7 years agoDO NOT MERGE -- Correctly finish activity in non-focused stack
Andrii Kulian [Thu, 21 Jul 2016 01:59:28 +0000 (18:59 -0700)]
DO NOT MERGE -- Correctly finish activity in non-focused stack

When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.

Bug: 29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
(cherry picked from commit 7318d63ba6dbb3042907d10d5369fcd5ac444d67)

7 years agodocs: Fixing formatting problem
Andrew Solovay [Fri, 26 Aug 2016 20:14:34 +0000 (13:14 -0700)]
docs: Fixing formatting problem

Fixing problem (mismatched <div> tags) that caused the page text to be
obscured. See first comment for doc stage location.

bug: 31046432
Change-Id: I82227fd29764755885458c1c011db534325fcde3

7 years agoMerge "Fetch ga script over https to avoid mixed content." into nyc-dev
Dirk Dougherty [Fri, 26 Aug 2016 16:22:05 +0000 (16:22 +0000)]
Merge "Fetch ga script over https to avoid mixed content." into nyc-dev

7 years agoMerge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev
Mark Lu [Fri, 26 Aug 2016 00:46:03 +0000 (00:46 +0000)]
Merge "docs: Fix typo and broken link in AsyncTask.java" into nyc-dev

7 years agoMerge "docs: fix link in Loader reference page" into nyc-dev
Mark Lu [Fri, 26 Aug 2016 00:46:00 +0000 (00:46 +0000)]
Merge "docs: fix link in Loader reference page" into nyc-dev

7 years agoMerge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours...
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:48 +0000 (23:41 +0000)]
Merge "resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25 am: 7a46fac0cd" into nyc-dev

7 years agoMerge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch"...
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:39 +0000 (23:41 +0000)]
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc  -s ours" into nyc-dev

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a1...
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:30 +0000 (23:41 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b  -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca am: 7586e03e06  -s ours" into nyc-dev

7 years agoMerge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch"...
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:16 +0000 (23:41 +0000)]
Merge "Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa am: bc5775c18b  -s ours" into nyc-dev

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2...
Android Build Merger (Role) [Thu, 25 Aug 2016 23:41:06 +0000 (23:41 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38 am: a106b52180  -s ours" into nyc-dev

7 years agoMerge "docs: Fix typo" into nyc-dev
Mark Goldstein [Thu, 25 Aug 2016 23:40:40 +0000 (23:40 +0000)]
Merge "docs: Fix typo" into nyc-dev

7 years agoresolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
Sudheer Shanka [Thu, 25 Aug 2016 23:39:59 +0000 (23:39 +0000)]
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3 am: 203d1bee25
am: 7a46fac0cd

Change-Id: Ib35ca340d72a71b8cd9ae6d850375012461977ad

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:39:54 +0000 (23:39 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39
am: 71933abbdc  -s ours

Change-Id: I5dbd13447fe89f0fa6040b9377098fda50335ca9

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189...
Amith Yamasani [Thu, 25 Aug 2016 23:39:49 +0000 (23:39 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b  -s ours am: 9080d4462e am: 75c7391a41 am: f6361752ca
am: 7586e03e06  -s ours

Change-Id: I404e1cdbb507d5c48c31cd3fddc3ff5f9e1078b5

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:39:41 +0000 (23:39 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb am: 2490679d7e am: 2f664374fa
am: bc5775c18b  -s ours

Change-Id: Iabe2db5b615a67130bffceca1801fd5ee9749ba0

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
Amith Yamasani [Thu, 25 Aug 2016 23:39:37 +0000 (23:39 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d am: 1d513c845a am: 5eed3c9c38
am: a106b52180  -s ours

Change-Id: Ia656bceb884d47015003d6c60f54f18f2217c01b

7 years agoresolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
Sudheer Shanka [Thu, 25 Aug 2016 23:30:05 +0000 (23:30 +0000)]
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c am: 77dec89bb3
am: 203d1bee25

Change-Id: Ib8939aceb6c23ce3273eef396a9d8fa09aa4aeb8

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:30:03 +0000 (23:30 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours am: 603a69ffb4 am: 97194798ab
am: c35a9fed39

Change-Id: Icf80dd720b371aa3ee488f074b5c038607691b80

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189...
Amith Yamasani [Thu, 25 Aug 2016 23:29:59 +0000 (23:29 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b  -s ours am: 9080d4462e am: 75c7391a41
am: f6361752ca

Change-Id: I09846a866cdfec673fd99d5c7574d31734335d85

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:29:56 +0000 (23:29 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb am: 2490679d7e
am: 2f664374fa

Change-Id: I08ec5c73b827a58274aaa3422bd5ca57eb67e402

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
Amith Yamasani [Thu, 25 Aug 2016 23:29:52 +0000 (23:29 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d am: 1d513c845a
am: 5eed3c9c38

Change-Id: I4470a56b330eb087ecd2f2662ad99fccbca917cf

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a2156...
Narayan Kamath [Thu, 25 Aug 2016 23:29:29 +0000 (23:29 +0000)]
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e am: a21569cd76
am: b0429bbad5

Change-Id: I0212348400f48551e21902938c5b42c7edb0ea9c

7 years agoresolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
Sudheer Shanka [Thu, 25 Aug 2016 23:22:19 +0000 (23:22 +0000)]
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c
am: 77dec89bb3

Change-Id: I1d755ef86b80f723c3fde59476e0018167fbf8b7

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:22:14 +0000 (23:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours am: 603a69ffb4
am: 97194798ab

Change-Id: If4a1716de3d54d6a08025665cdff51edc1b2f6da

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189...
Amith Yamasani [Thu, 25 Aug 2016 23:22:10 +0000 (23:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b  -s ours am: 9080d4462e
am: 75c7391a41

Change-Id: I2646c10763640e6079e09e6fd53b9958b3aba2ea

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:22:04 +0000 (23:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours am: 86ac88ccdb
am: 2490679d7e

Change-Id: I59f3ace3a9c72a6d2fe1e1bd4cadec102a8c6254

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
Amith Yamasani [Thu, 25 Aug 2016 23:22:00 +0000 (23:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours am: 368ae62e9d
am: 1d513c845a

Change-Id: If920208b052d41a80d3a0bf70af831313c9b9c06

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
Narayan Kamath [Thu, 25 Aug 2016 23:21:09 +0000 (23:21 +0000)]
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624 am: 8f4f9e4d5e
am: a21569cd76

Change-Id: I502200a2a204e576944033a58ccd4be272603d5e

7 years agoresolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
Sudheer Shanka [Thu, 25 Aug 2016 23:14:09 +0000 (23:14 +0000)]
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3
am: c2a760e68c

Change-Id: I2e5a3bb037921013e78b4270d843cebe239ac520

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:14:06 +0000 (23:14 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc  -s ours
am: 603a69ffb4

Change-Id: Ie94c3c24a3b07c26c8b363358f4df1d7366d95a2

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189...
Amith Yamasani [Thu, 25 Aug 2016 23:14:04 +0000 (23:14 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec am: 7b8140652b  -s ours
am: 9080d4462e

Change-Id: Idd437ad418ac2deaf08a9c0ac89cb518c216d8f1

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:14:01 +0000 (23:14 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6 am: 26bb7bf86c  -s ours
am: 86ac88ccdb

Change-Id: Ia473e706d7b50376fffb122e03e48bd947f47562

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
Amith Yamasani [Thu, 25 Aug 2016 23:13:58 +0000 (23:13 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0 am: 117a383099  -s ours
am: 368ae62e9d

Change-Id: Icfafc6e9d56a97777db1c3d0e0feae3305f6707f

7 years agoresolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
Narayan Kamath [Thu, 25 Aug 2016 23:13:51 +0000 (23:13 +0000)]
resolve merge conflicts of 5191225 to mnc-dev am: 1fbc4b8624
am: 8f4f9e4d5e

Change-Id: I2f470a15113ac14219dea82c3a9487ef96f3f2f4

7 years agoresolve merge conflicts of 5191225 to mnc-dev
Narayan Kamath [Thu, 25 Aug 2016 23:08:25 +0000 (23:08 +0000)]
resolve merge conflicts of 5191225 to mnc-dev
am: 1fbc4b8624

Change-Id: Id3aad329dd515a392cbeb2f0e03c2eb5aee5cf71

7 years agoresolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
Sudheer Shanka [Thu, 25 Aug 2016 23:07:56 +0000 (23:07 +0000)]
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58
am: cdf70ba0a3

Change-Id: Ia7c597b1b96e65cce89396a6b509a796bb17bc2c

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:07:53 +0000 (23:07 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905  -s ours am: f368bdee06 am: f21534a288
am: dfc2d0a4bc  -s ours

Change-Id: Ia4a5952bc4fda5be8602708215ff1d72a5db297a

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189...
Amith Yamasani [Thu, 25 Aug 2016 23:07:51 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: a92810a189  -s ours am: 9be12f8986 am: 03b0f5c3ec
am: 7b8140652b  -s ours

Change-Id: I40d855d0f87483a6a8733475b490ddf6ee582433

7 years agoMerge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp...
Sudheer Shanka [Thu, 25 Aug 2016 23:07:49 +0000 (23:07 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-mr1-dev am: 5e55214ab7 am: c8aedeeaf6
am: 26bb7bf86c  -s ours

Change-Id: Id2ddb640c8d041f13a78c5f07fb1749968618b61

7 years agoDO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf...
Amith Yamasani [Thu, 25 Aug 2016 23:07:46 +0000 (23:07 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am: b02862c2cf am: dd0be992c0
am: 117a383099  -s ours

Change-Id: I8173ba5c3156a6294d672db63c4a310b0c880cfb

7 years agoFetch ga script over https to avoid mixed content.
Dirk Dougherty [Thu, 25 Aug 2016 21:50:54 +0000 (14:50 -0700)]
Fetch ga script over https to avoid mixed content.

Change-Id: Ic8f3421c67464b941312d6854267adfdf499aa43

7 years agoMerge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev
TreeHugger Robot [Thu, 25 Aug 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Try to mitigate issue #31016187: system_server crash in ArraySet." into nyc-dev

7 years agoMerge "docs: rewrite one attribute description in R.attr" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:34:02 +0000 (21:34 +0000)]
Merge "docs: rewrite one attribute description in R.attr" into nyc-dev

7 years agoMerge "docs: fix broken links in Activity reference" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:33:28 +0000 (21:33 +0000)]
Merge "docs: fix broken links in Activity reference" into nyc-dev

7 years agoMerge "docs: fix code snippets in SQL Databases page" into nyc-dev
Mark Lu [Thu, 25 Aug 2016 21:33:24 +0000 (21:33 +0000)]
Merge "docs: fix code snippets in SQL Databases page" into nyc-dev

7 years agoDocs: Fixed the Bluetooth guide link
Hemal Patel [Thu, 25 Aug 2016 21:31:56 +0000 (21:31 +0000)]
Docs: Fixed the Bluetooth guide link
am: 65813dff14

Change-Id: I4502828940c4f2e33363e10728e97f484bc15651

7 years agoTry to mitigate issue #31016187: system_server crash in ArraySet.
Dianne Hackborn [Wed, 24 Aug 2016 21:54:20 +0000 (14:54 -0700)]
Try to mitigate issue #31016187: system_server crash in ArraySet.

Instead of crashing, log a wtf and recover.  This is not a problem
in ArraySet, but caused by someone else using an ArraySet without
protecting access to it.  So whoever is calling at this point is
not the cause, and it isn't worthwhile to let them crash.

Change-Id: Iaefa4315b620c9fe24b31507e4aa47a8525c8540
(cherry picked from commit 92aa4b2ba3c93cc344c885b50b75726599e6065d)

7 years agodocs: Fix typo
Mark Goldstein [Thu, 25 Aug 2016 19:48:07 +0000 (12:48 -0700)]
docs: Fix typo

Bug: 25777114
Change-Id: I5c34ceba8f3b76bd47e1c020956cef285bad59d7

7 years agodocs: Removing non-English /preview/ directories
Andrew Solovay [Thu, 25 Aug 2016 19:36:36 +0000 (12:36 -0700)]
docs: Removing non-English /preview/ directories

The remaining docs in the [language]/preview directories were
causing devsite publish to fail (they refer to files that no longer
exist). Removing all those directories; redirects are already set up.

See first comment for doc stage location.

Change-Id: Ic22652d44696ec2647586e19aa61627d40232239

7 years agoresolve merge conflicts of 5191225 to mnc-dev
Narayan Kamath [Thu, 25 Aug 2016 09:43:25 +0000 (10:43 +0100)]
resolve merge conflicts of 5191225 to mnc-dev

Change-Id: I8dd276f61e77b0fe2d861f4b0d34d76bf533192f

7 years agoProcess: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f...
Narayan Kamath [Thu, 25 Aug 2016 01:25:55 +0000 (01:25 +0000)]
Process: Fix communication with zygote. am: e29c6493c0 am: 1bd43c162f am: 3c63bb367f am: c11e8fcc04 am: c01db7dca3 am: 8e168116d0 am: dd496ec8b0
am: 472a7792f3

Change-Id: I065968bf2bd6166eae33c7eec347e371a5edf447

7 years agoFix vulnerability where large GPS XTRA data can be injected. -Can potentially crash...
David Christie [Thu, 25 Aug 2016 01:25:46 +0000 (01:25 +0000)]
Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1 am: 62783bde30 am: 8788a2413c am: c6ab92e93b am: 3970ee98f7 am: 735699f3ef am: 551e6c786f
am: 80b8f38224

Change-Id: I43da972f73a86a305d2b20db6cb2d30180e7287c

7 years agoresolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0d...
David Christie [Thu, 25 Aug 2016 01:25:38 +0000 (01:25 +0000)]
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 am: d610363a48 am: 0777ad8253 am: 187d841b75
am: 7f2aaf204d

Change-Id: I64ff311815620d7e26ef91d33afc8499abf63c83

7 years agoresolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619...
David Christie [Thu, 25 Aug 2016 01:25:30 +0000 (01:25 +0000)]
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7
am: 00e1e39ae2

Change-Id: I23587e80ea85f66e872e8bf0a9b1f83399c3b6fc