OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Docs: Updated localizations for N Developer Preview docs.\" into nyc-dev
David Friedman [Wed, 15 Jun 2016 01:46:04 +0000 (01:46 +0000)]
Merge \"Docs: Updated localizations for N Developer Preview docs.\" into nyc-dev
am: 07af76b039

Change-Id: I19c01ced2d1ac4463c1e23462aebfbf761cf1bd7

8 years agoMerge "Docs: Updated localizations for N Developer Preview docs." into nyc-dev
David Friedman [Wed, 15 Jun 2016 01:39:40 +0000 (01:39 +0000)]
Merge "Docs: Updated localizations for N Developer Preview docs." into nyc-dev

8 years agoDocs: Updated localizations for N Developer Preview docs.
David Friedman [Wed, 15 Jun 2016 01:14:49 +0000 (18:14 -0700)]
Docs: Updated localizations for N Developer Preview docs.

Bug: 28912213

Change-Id: I8ff0dd5989863ce4097e2290ff9a10e4cc5789ec

8 years agoMerge \"Update CTS shims\" into nyc-dev
Todd Kennedy [Wed, 15 Jun 2016 01:35:09 +0000 (01:35 +0000)]
Merge \"Update CTS shims\" into nyc-dev
am: 6f140a249a

Change-Id: I46a95ea5eb9199c63e8f0a62ddf7c6eac149147d

8 years agoMerge "Update CTS shims" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Update CTS shims" into nyc-dev

8 years agoMerge \"Only skip trimming task if the stacks are not null.\" into nyc-dev
Winson [Wed, 15 Jun 2016 01:16:02 +0000 (01:16 +0000)]
Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev
am: 6ba96df815

Change-Id: I58b230bb33330fbb130094cc937c4aeaf5976baa

8 years agoMerge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev
Sudheer Shanka [Wed, 15 Jun 2016 01:12:11 +0000 (01:12 +0000)]
Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev
am: 159c13801b

Change-Id: Ic4d94327a21f2a8b8ae175e057039eafb9c2d698

8 years agoMerge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
David Friedman [Wed, 15 Jun 2016 01:12:07 +0000 (01:12 +0000)]
Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
am: ea1f3cb5c3

Change-Id: Ia61b3fd592e19c7fb021b0f22e3eeb8bbc6b5b4f

8 years agoMerge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
Robert Carr [Wed, 15 Jun 2016 01:12:03 +0000 (01:12 +0000)]
Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am: 3e5df9fb50

Change-Id: I97742b1d180ff1c38a1aa7ea0a13c981a38c1df3

8 years agoMerge "Only skip trimming task if the stacks are not null." into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 01:08:57 +0000 (01:08 +0000)]
Merge "Only skip trimming task if the stacks are not null." into nyc-dev

8 years agoMerge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
Shawn Willden [Wed, 15 Jun 2016 01:05:26 +0000 (01:05 +0000)]
Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
am: 2c2f8acdab

Change-Id: I89b9c88159f99681049ce401f22ca9ea8578b27c

8 years agoMerge "Allow apps with CREATE_USERS permission to call UM.getUserInfo." into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 01:02:32 +0000 (01:02 +0000)]
Merge "Allow apps with CREATE_USERS permission to call UM.getUserInfo." into nyc-dev

8 years agoMerge "Docs: Adds SurfaceView to API Overview page for Android-N DP4." into nyc-dev
David Friedman [Wed, 15 Jun 2016 00:59:52 +0000 (00:59 +0000)]
Merge "Docs: Adds SurfaceView to API Overview page for Android-N DP4." into nyc-dev

8 years agoMerge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:59:19 +0000 (00:59 +0000)]
Merge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev

8 years agoMerge "Unbreak Javadoc on getAttestationChallenge()" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:56:45 +0000 (00:56 +0000)]
Merge "Unbreak Javadoc on getAttestationChallenge()" into nyc-dev

8 years agoDocs: Adds SurfaceView to API Overview page for Android-N DP4.
David Friedman [Tue, 14 Jun 2016 22:37:16 +0000 (15:37 -0700)]
Docs: Adds SurfaceView to API Overview page for Android-N DP4.

Change-Id: I29854c82ef788b00c1ebc305bc5faf463c2d8dc8

8 years agoMerge \"Add API 24 to reference selector.\" into nyc-dev
Dirk Dougherty [Wed, 15 Jun 2016 00:28:03 +0000 (00:28 +0000)]
Merge \"Add API 24 to reference selector.\" into nyc-dev
am: 398d088871

Change-Id: I51a61188186026eac5c12f3b0d0ec52eebf60f38

8 years agoMerge "Add API 24 to reference selector." into nyc-dev
Dirk Dougherty [Wed, 15 Jun 2016 00:20:26 +0000 (00:20 +0000)]
Merge "Add API 24 to reference selector." into nyc-dev

8 years agoMerge \"Doc change: add diffs for 23->24.\" into nyc-dev
Dirk Dougherty [Tue, 14 Jun 2016 23:52:03 +0000 (23:52 +0000)]
Merge \"Doc change: add diffs for 23->24.\" into nyc-dev
am: 70e358b017

Change-Id: I54efbc44f2cea31f575c89a3543f571540653a15

8 years agoMerge "Doc change: add diffs for 23->24." into nyc-dev
Dirk Dougherty [Tue, 14 Jun 2016 23:44:23 +0000 (23:44 +0000)]
Merge "Doc change: add diffs for 23->24." into nyc-dev

8 years agoOnly skip trimming task if the stacks are not null.
Winson [Tue, 14 Jun 2016 22:39:27 +0000 (15:39 -0700)]
Only skip trimming task if the stacks are not null.

Bug: 2912181929359871
Change-Id: I8f8602796e316ed5b36a033e4eaa020650064f74

8 years agoAdd API 24 to reference selector.
Dirk Dougherty [Tue, 14 Jun 2016 23:26:28 +0000 (16:26 -0700)]
Add API 24 to reference selector.

Change-Id: I153245ef814e27bf50f9d972ad1aa34fd92e6b8a

8 years agoAllow apps with CREATE_USERS permission to call UM.getUserInfo.
Sudheer Shanka [Tue, 14 Jun 2016 23:22:57 +0000 (16:22 -0700)]
Allow apps with CREATE_USERS permission to call UM.getUserInfo.

Bug: 29355382
Change-Id: Iaf73c453156e3a989660d05124b0c0938619abd7

8 years agoMerge \"Make sure task exists in WM before trying to set the resizing state\" into...
Wale Ogunwale [Tue, 14 Jun 2016 23:11:29 +0000 (23:11 +0000)]
Merge \"Make sure task exists in WM before trying to set the resizing state\" into nyc-dev
am: 39647560d1

Change-Id: I077e2d9432cdcb4f4e796df158c9fdb701e2a5f6

8 years agoMerge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 23:11:25 +0000 (23:11 +0000)]
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
am: 02ab2f52bf

Change-Id: If26ae07e20433213334233bea1231440fae817e1

8 years agoMerge "Make sure task exists in WM before trying to set the resizing state" into...
TreeHugger Robot [Tue, 14 Jun 2016 23:05:49 +0000 (23:05 +0000)]
Merge "Make sure task exists in WM before trying to set the resizing state" into nyc-dev

8 years agoMerge "Fixed another case where the systemUI could crashloop" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 23:04:30 +0000 (23:04 +0000)]
Merge "Fixed another case where the systemUI could crashloop" into nyc-dev

8 years agoMerge \"docs: Noted \"Crypto\" removal\" into nyc-dev
Andrew Solovay [Tue, 14 Jun 2016 23:02:30 +0000 (23:02 +0000)]
Merge \"docs: Noted \"Crypto\" removal\" into nyc-dev
am: 8d7b4a4945

Change-Id: I52083f2f0e7ebf90fe01b25f5f081e5477f1da91

8 years agoUnbreak Javadoc on getAttestationChallenge()
Shawn Willden [Tue, 14 Jun 2016 22:59:14 +0000 (16:59 -0600)]
Unbreak Javadoc on getAttestationChallenge()

Bug: 28844154
Change-Id: I8402a39f366291cd2b5d646536cd2c2bab8556d2

8 years agoMerge "docs: Noted "Crypto" removal" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 22:54:46 +0000 (22:54 +0000)]
Merge "docs: Noted "Crypto" removal" into nyc-dev

8 years agoMerge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev
Yohei Yukawa [Tue, 14 Jun 2016 22:47:28 +0000 (22:47 +0000)]
Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev
am: 6fe4865e85

Change-Id: Id039d1dd681483c1d86349ee7e765b2f1f4fa95f

8 years agoToast timeout: Just strip FLAG_KEEP_SCREEN_ON
Robert Carr [Sat, 11 Jun 2016 01:44:24 +0000 (18:44 -0700)]
Toast timeout: Just strip FLAG_KEEP_SCREEN_ON

We added the toast timeout to fix b/21693547. Where the client
leaks non visible toasts which end up keeping the screen on.
Simply removing the toast windows as we were doing previously,
isn't very good though. If the timeout fires when an app could
still use the toast (e.g. due to long pause under debugger),
the app could crash. It's not obvious how (if even possible
without API semantic/guarantee change) to prevent this issue
from the client side. Furthermore, #33 at b/21693457 implies that
we need to respect FLAG_KEEP_SCREEN_ON even for windows that
never submitted a buffer. With time constraints as they are,
the only solution I can think of that solves both without
chance of regression is just stripping FLAG_KEEP_SCREEN_ON when the
timeout fires.

Bug: 29105388
Change-Id: Ic2df897f86acf814ea3d4f911a0532d65af0c19f

8 years agoMerge "Quick workaround for a performance regression in IME APIs." into nyc-dev
Yohei Yukawa [Tue, 14 Jun 2016 22:43:18 +0000 (22:43 +0000)]
Merge "Quick workaround for a performance regression in IME APIs." into nyc-dev

8 years agoMerge \"Version PrintRecommendationService.\" into nyc-dev
Philip P. Moltmann [Tue, 14 Jun 2016 22:19:45 +0000 (22:19 +0000)]
Merge \"Version PrintRecommendationService.\" into nyc-dev
am: 8e3a16ad91

Change-Id: Ic4d75b1549d314e46db032f3e3506e2cd4776308

8 years agoMerge \"Revert \"Don\'t update task to return to type for last task over home\"\...
Andrii Kulian [Tue, 14 Jun 2016 22:08:50 +0000 (22:08 +0000)]
Merge \"Revert \"Don\'t update task to return to type for last task over home\"\" into nyc-dev
am: 5c176ff133

Change-Id: I7a901be3116ee6ee8005ee7d6e41c1781ad02718

8 years agoDocs: Added overview of Custom Pointer API
Hemal Patel [Tue, 14 Jun 2016 22:08:46 +0000 (22:08 +0000)]
Docs: Added overview of Custom Pointer API
am: 37663db137

Change-Id: I8e1824c392fda188fa276a5d2da7ec990a17030b

8 years agoMerge "Version PrintRecommendationService." into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 22:08:41 +0000 (22:08 +0000)]
Merge "Version PrintRecommendationService." into nyc-dev

8 years agoMerge "Revert "Don't update task to return to type for last task over home"" into...
TreeHugger Robot [Tue, 14 Jun 2016 21:55:53 +0000 (21:55 +0000)]
Merge "Revert "Don't update task to return to type for last task over home"" into nyc-dev

8 years agoMake sure task exists in WM before trying to set the resizing state
Wale Ogunwale [Tue, 14 Jun 2016 20:10:09 +0000 (13:10 -0700)]
Make sure task exists in WM before trying to set the resizing state

It is possible for a task to be removed from the WM and stack in AM
while resizing (e.g. app crashes). In this case we want to make sure
the task exist in WM before we try to set the dock resizing state vs.
depending on the fact that the task is in recent list in AM.

Bug: 29325623
Change-Id: Ib89a7bfe12fe1f2c4c6c56ac9e13b0052ea2b4ec

8 years agoDocs: Added overview of Custom Pointer API
Hemal Patel [Mon, 13 Jun 2016 21:37:36 +0000 (14:37 -0700)]
Docs: Added overview of Custom Pointer API

Bug: 28241984
Change-Id: Iffa2a0cc46f71377b79f4ac792d2f469353cc395

8 years agoQuick workaround for a performance regression in IME APIs.
Yohei Yukawa [Tue, 14 Jun 2016 05:16:52 +0000 (22:16 -0700)]
Quick workaround for a performance regression in IME APIs.

It turns out that the performance of
InputMethodManager#getCurrentInputMethodSubtype() is regressed from ~1ms
to ~20ms when
 - Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE == -1 and
 - The active IME supports many subtypes (~100)
because we try to find a fallback subtype based on the system locales
every time when IMM#getCurrentInputMethodSubtype() is called.

This could be contributing UI janks because spell checker clients
running in the UI thread indirectly depend on that method.

Fortunatelly the critical path is in
InputMethodUtils#getImplicitlyApplicableSubtypesLockedImpl(), which is
basically a state-less method. We can easily and safely cache its
result by using LocaleList and InputMethod as cache keys.

With this CL the performance basically recovers to the Android M level.

Bug: 28889203
Change-Id: I5ed16c7f14cc18052854f4fd6c9bae8550c332ee

8 years agoOnly reload callback on configuration change.
Julia Reynolds [Tue, 14 Jun 2016 20:54:27 +0000 (20:54 +0000)]
Only reload callback on configuration change.
am: 8d0a400119

Change-Id: I1f3fbfd28483ab27a426ef005fa78553e5185036

8 years agoMerge \"Fixing several issues with accessibility\" into nyc-dev
Winson [Tue, 14 Jun 2016 20:54:22 +0000 (20:54 +0000)]
Merge \"Fixing several issues with accessibility\" into nyc-dev
am: 987cd20acf

Change-Id: Ifac613535ad66ebdeab76fa76298375b8b6fd658

8 years agoMerge \"Revert \"Announce access point changes.\"\" into nyc-dev
Julia Reynolds [Tue, 14 Jun 2016 20:54:17 +0000 (20:54 +0000)]
Merge \"Revert \"Announce access point changes.\"\" into nyc-dev
am: a64e3a0844

Change-Id: I3f534d166a4296411b09e9d54116cdf17f61f818

8 years agoMerge \"Note null alarm worksource names under the alarm\'s package\" into nyc-dev
Christopher Tate [Tue, 14 Jun 2016 20:54:09 +0000 (20:54 +0000)]
Merge \"Note null alarm worksource names under the alarm\'s package\" into nyc-dev
am: 2f4636a333

Change-Id: I326cbd9ed3494797190fc9ee8bfe22a5cdc844c8

8 years agoMerge \"docs: Updated support library revisions page for 24.0.0\" into nyc-dev
Andrew Solovay [Tue, 14 Jun 2016 20:53:58 +0000 (20:53 +0000)]
Merge \"docs: Updated support library revisions page for 24.0.0\" into nyc-dev
am: eb4e8105d3

Change-Id: I4f53b453d1b72d6051b50e3ec3dd979020ea7c6a

8 years agodocs: Noted "Crypto" removal
Andrew Solovay [Fri, 10 Jun 2016 23:34:27 +0000 (16:34 -0700)]
docs: Noted "Crypto" removal

See first comment for doc stage location.

bug: 28972616
Change-Id: I891af3d2e0b84f2daa207221e477a09efafc9d18

8 years agoOnly reload callback on configuration change.
Julia Reynolds [Tue, 14 Jun 2016 19:24:39 +0000 (15:24 -0400)]
Only reload callback on configuration change.

So it'll get zen changes when the volume dialog is not showing.

Change-Id: I0d4220d0a000d74c6994b07b2d5b8562a6a52585
Fixes: 29355577

8 years agoMerge "Fixing several issues with accessibility" into nyc-dev
Winson Chung [Tue, 14 Jun 2016 20:42:21 +0000 (20:42 +0000)]
Merge "Fixing several issues with accessibility" into nyc-dev

8 years agoMerge "Revert "Announce access point changes."" into nyc-dev
Julia Reynolds [Tue, 14 Jun 2016 20:42:14 +0000 (20:42 +0000)]
Merge "Revert "Announce access point changes."" into nyc-dev

8 years agoMerge "Note null alarm worksource names under the alarm's package" into nyc-dev
Chris Tate [Tue, 14 Jun 2016 20:37:06 +0000 (20:37 +0000)]
Merge "Note null alarm worksource names under the alarm's package" into nyc-dev

8 years agoMerge "docs: Updated support library revisions page for 24.0.0" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 20:36:28 +0000 (20:36 +0000)]
Merge "docs: Updated support library revisions page for 24.0.0" into nyc-dev

8 years agoMerge \\\"docs: Clarifying direct boot notification messages\\\" into mnc-io-docs...
Daniel Yu [Tue, 14 Jun 2016 20:07:00 +0000 (20:07 +0000)]
Merge \\\"docs: Clarifying direct boot notification messages\\\" into mnc-io-docs am: 120fd583d5 am: 4c5e5ec6d5
am: 189ef624d1

Change-Id: I8dd09259cd766055b3fff690cb4bbc12d871ec85

8 years agoVersion PrintRecommendationService.
Philip P. Moltmann [Tue, 14 Jun 2016 20:06:49 +0000 (13:06 -0700)]
Version PrintRecommendationService.

Fixes: 28908572
Change-Id: I8df106df887cacc8db37f781ade97678960cee04

8 years agoRevert "Don't update task to return to type for last task over home"
Andrii Kulian [Tue, 14 Jun 2016 19:57:32 +0000 (19:57 +0000)]
Revert "Don't update task to return to type for last task over home"

This reverts commit 21893824c1d15a1a46cb75725ad951620569c3c6.

Original commit revealed issue b/29342752 when launch logic was applied
to incorrect stack while moving to PiP mode.

Bug: 29342752
Bug: 29237751
Change-Id: I88d75399eb4b9daf4de87a9a560eb0df0b515173

8 years agoFixed another case where the systemUI could crashloop
Selim Cinek [Tue, 14 Jun 2016 17:57:25 +0000 (10:57 -0700)]
Fixed another case where the systemUI could crashloop

Because it's not guaranteed to use any builder at all,
there is another case where the SmallIcon could remain null.
We are now checking this lazily instead of ahead of time.

Change-Id: I7a0feff6911b2bce6707427259d3423131a26e32
Fixes: 29255365

8 years agoMerge \\"docs: Clarifying direct boot notification messages\\" into mnc-io-docs am...
Dan Yu [Tue, 14 Jun 2016 19:59:36 +0000 (19:59 +0000)]
Merge \\"docs: Clarifying direct boot notification messages\\" into mnc-io-docs am: 120fd583d5
am: 4c5e5ec6d5

Change-Id: I2bfe82b79c928d10b7725315d42b00a1994bbd52

8 years agoMerge \"Improve action bar transition\" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:56:59 +0000 (19:56 +0000)]
Merge \"Improve action bar transition\" into nyc-dev
am: 207cbee824

Change-Id: I9fe03bc7409f2631aa8b7a5d1d2a8542d4a1fd3c

8 years agoMerge \"docs: Clarifying direct boot notification messages\" into mnc-io-docs
Daniel Yu [Tue, 14 Jun 2016 19:53:35 +0000 (19:53 +0000)]
Merge \"docs: Clarifying direct boot notification messages\" into mnc-io-docs
am: 120fd583d5

Change-Id: I076e69e0a0497ed461dc576b72419152e89bb010

8 years agoMerge "docs: Clarifying direct boot notification messages" into mnc-io-docs
Dan Yu [Tue, 14 Jun 2016 19:49:11 +0000 (19:49 +0000)]
Merge "docs: Clarifying direct boot notification messages" into mnc-io-docs

8 years agoUpdate CTS shims
Todd Kennedy [Tue, 14 Jun 2016 19:35:39 +0000 (12:35 -0700)]
Update CTS shims

* define a update hash such that com.android.cts.priv.ctsshim can't
  be updated
* create a new APK to verify that <restrict-update> works as expected

Bug: 29311441
Change-Id: I61f3ae3dbd9c79b2dcdfbc30757af0f9a669fce6

8 years agoMerge "Improve action bar transition" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:42:40 +0000 (19:42 +0000)]
Merge "Improve action bar transition" into nyc-dev

8 years agoMerge \"Fix jittery action bar during transitions\" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:42:03 +0000 (19:42 +0000)]
Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I398e98789bd7ebac32289a0a84ba9ab3393fb70e

8 years agoMerge \"Make RemoteView margins density-change safe\" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:41:59 +0000 (19:41 +0000)]
Merge \"Make RemoteView margins density-change safe\" into nyc-dev
am: 26e864c398

Change-Id: I9fb7b321751443c750ee8acb0190a79dd8669941

8 years agoMerge "Fix jittery action bar during transitions" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:31:24 +0000 (19:31 +0000)]
Merge "Fix jittery action bar during transitions" into nyc-dev

8 years agoMerge "Make RemoteView margins density-change safe" into nyc-dev
Adrian Roos [Tue, 14 Jun 2016 19:31:12 +0000 (19:31 +0000)]
Merge "Make RemoteView margins density-change safe" into nyc-dev

8 years agoMerge \"Update SyncManager min period to match JobScheduler\" into nyc-dev
Shreyas Basarge [Tue, 14 Jun 2016 19:04:02 +0000 (19:04 +0000)]
Merge \"Update SyncManager min period to match JobScheduler\" into nyc-dev
am: 166b0abf13

Change-Id: I8cfeb60e96a58d6778488c1b4c3ce9565a11bf88

8 years agoMerge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
Wei Jia [Tue, 14 Jun 2016 18:58:55 +0000 (18:58 +0000)]
Merge \"MediaPlayer: fix java doc for setSurface and setDisplay.\" into nyc-dev
am: c6f39a0c36

Change-Id: I1c6dea8e60e96804c9d7564b367c21b146728072

8 years agoMerge "Update SyncManager min period to match JobScheduler" into nyc-dev
Shreyas Basarge [Tue, 14 Jun 2016 18:54:43 +0000 (18:54 +0000)]
Merge "Update SyncManager min period to match JobScheduler" into nyc-dev

8 years agoMerge "MediaPlayer: fix java doc for setSurface and setDisplay." into nyc-dev
Wei Jia [Tue, 14 Jun 2016 18:50:00 +0000 (18:50 +0000)]
Merge "MediaPlayer: fix java doc for setSurface and setDisplay." into nyc-dev

8 years agoMerge \"docs: Updating N download pages for DP4\" into nyc-dev
Andrew Solovay [Tue, 14 Jun 2016 18:32:54 +0000 (18:32 +0000)]
Merge \"docs: Updating N download pages for DP4\" into nyc-dev
am: f2d5d876b9

Change-Id: I30d07c84d858d3ca262320525082c7cf8a5e1c3a

8 years agoMerge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into...
Makoto Onuki [Tue, 14 Jun 2016 18:26:00 +0000 (18:26 +0000)]
Merge \"Don\'t take the DPMS lock in DPMI.createPackageSuspendedDialogIntent\" into nyc-dev
am: 5e94a16b74

Change-Id: I61c3582d8b51124b33b39249f20bdfe71e764a69

8 years agoMerge "docs: Updating N download pages for DP4" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 18:20:48 +0000 (18:20 +0000)]
Merge "docs: Updating N download pages for DP4" into nyc-dev

8 years agoMerge \"Docs: Changed a command in Keyboard Shortcuts\" into nyc-dev
Hemal Patel [Tue, 14 Jun 2016 18:19:54 +0000 (18:19 +0000)]
Merge \"Docs: Changed a command in Keyboard Shortcuts\" into nyc-dev
am: d0067507be

Change-Id: Id30ee255e889c18cba0ab43cd9d0759e35dd53b7

8 years agoMerge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into...
Makoto Onuki [Tue, 14 Jun 2016 18:17:00 +0000 (18:17 +0000)]
Merge "Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent" into nyc-dev

8 years agoMerge "Docs: Changed a command in Keyboard Shortcuts" into nyc-dev
Hemal Patel [Tue, 14 Jun 2016 18:11:09 +0000 (18:11 +0000)]
Merge "Docs: Changed a command in Keyboard Shortcuts" into nyc-dev

8 years agoMediaPlayer: fix java doc for setSurface and setDisplay.
Wei Jia [Tue, 14 Jun 2016 17:53:40 +0000 (10:53 -0700)]
MediaPlayer: fix java doc for setSurface and setDisplay.

Bug: 29149415
Change-Id: I281b6328c068255387ca01a987ff136c3be5e25b

8 years agoMerge \\\"Fix broken {@docRoot} links\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a
Aurimas Liutikas [Tue, 14 Jun 2016 17:44:17 +0000 (17:44 +0000)]
Merge \\\"Fix broken {@docRoot} links\\\" into mnc-io-docs am: a0fa50e40b am: 423fe7db6a
am: 68d5e4b9ff

Change-Id: I19ac9f6a9006030e2aeba2a1b48c2781d263ad01

8 years agoMerge \\"Fix broken {@docRoot} links\\" into mnc-io-docs am: a0fa50e40b
Aurimas Liutikas [Tue, 14 Jun 2016 17:37:38 +0000 (17:37 +0000)]
Merge \\"Fix broken {@docRoot} links\\" into mnc-io-docs am: a0fa50e40b
am: 423fe7db6a

Change-Id: I192297bc254d199e25249952591b3b2a1fc2b617

8 years agoRevert "Announce access point changes."
Julia Reynolds [Tue, 14 Jun 2016 17:28:47 +0000 (17:28 +0000)]
Revert "Announce access point changes."

Fixes: 29151018

This reverts commit 7ed62eb7a214126d3dbfd6abd7d6a7db73cc9f3c.

Change-Id: If40669b21cc2a2db7e2bb27c7c981d889cb094ed

8 years agoMerge \"Fix broken {@docRoot} links\" into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 17:27:57 +0000 (17:27 +0000)]
Merge \"Fix broken {@docRoot} links\" into mnc-io-docs
am: a0fa50e40b

Change-Id: I7dd53f31f44262e09624d23d820723893aaba5c7

8 years agoNote null alarm worksource names under the alarm's package
Christopher Tate [Tue, 14 Jun 2016 17:16:28 +0000 (10:16 -0700)]
Note null alarm worksource names under the alarm's package

And log a nastygram because it implies the app is misbehaving.

Bug 29333122

Change-Id: Ia683304b8a9eafb234df81e874ee3f0636c4e56a

8 years agoMerge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
qingxi [Tue, 14 Jun 2016 17:15:41 +0000 (17:15 +0000)]
Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am: 130db7715a

Change-Id: I130ba1362d755e1859d5c22311867008d0626890

8 years agoMerge "Fix broken {@docRoot} links" into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 17:14:57 +0000 (17:14 +0000)]
Merge "Fix broken {@docRoot} links" into mnc-io-docs

8 years agoMerge "Add a key for setting carrier's CDMA roaming mode" into nyc-dev
Qingxi Li [Tue, 14 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Add a key for setting carrier's CDMA roaming mode" into nyc-dev

8 years agoMerge \"Fixed a bug with a legacy notification API\" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 17:02:39 +0000 (17:02 +0000)]
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
am: 05e19bba37

Change-Id: I419b48b3a4e73b5cc1c7597d885541f4b163a00f

8 years agoMerge "Fixed a bug with a legacy notification API" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 16:54:20 +0000 (16:54 +0000)]
Merge "Fixed a bug with a legacy notification API" into nyc-dev

8 years agoDon't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent
Makoto Onuki [Mon, 13 Jun 2016 21:50:11 +0000 (14:50 -0700)]
Don't take the DPMS lock in DPMI.createPackageSuspendedDialogIntent

This method is called by AM with the lock held, so can't take the
DPMS lock.

It still takes a different lock, but we don't call into the external
world while holding this lock, so this is fine.

Bug 29242568

Change-Id: Idbecdd7d97385ca66c693903443471fdbae833e6

8 years agodocs: Clarifying direct boot notification messages
Daniel Yu [Mon, 6 Jun 2016 18:27:07 +0000 (11:27 -0700)]
docs: Clarifying direct boot notification messages

Adding details on which notification message to listen for
when developing apps that need to interact with direct boot mode.
Note: This is a doc fix for the N direct boot feature docs, but
not specific to any preview release.

Bug: 28729775
Change-Id: If6b239e7aa92bced735cfa1e72d8891d193a420c

8 years agoMerge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am: 99677fb42d...
Bert McMeen [Tue, 14 Jun 2016 15:21:58 +0000 (15:21 +0000)]
Merge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am: 99677fb42d am: 106af82850
am: 22eb26c27d

Change-Id: Ifd3b004c5401ba7374d642439938849da19060e8

8 years agoMerge \\"Docs: Watch face performance update\\" into mnc-io-docs am: 99677fb42d
Bert McMeen [Tue, 14 Jun 2016 15:15:59 +0000 (15:15 +0000)]
Merge \\"Docs: Watch face performance update\\" into mnc-io-docs am: 99677fb42d
am: 106af82850

Change-Id: Ia9fa224a4ebb6e51a3c6141751036504d202e137

8 years agoMerge \"Docs: Watch face performance update\" into mnc-io-docs
Bert McMeen [Tue, 14 Jun 2016 15:07:53 +0000 (15:07 +0000)]
Merge \"Docs: Watch face performance update\" into mnc-io-docs
am: 99677fb42d

Change-Id: I41b6ee0628e561cfb7f711d07ac1e41ff71fcb60

8 years agoMerge "Docs: Watch face performance update" into mnc-io-docs
Bert McMeen [Tue, 14 Jun 2016 15:01:59 +0000 (15:01 +0000)]
Merge "Docs: Watch face performance update" into mnc-io-docs

8 years agoUpdate SyncManager min period to match JobScheduler
Shreyas Basarge [Tue, 14 Jun 2016 14:32:02 +0000 (15:32 +0100)]
Update SyncManager min period to match JobScheduler

Use JobScheduler's minimum period in SyncManager.
Syncs will respect JobScheduler's min period anyway,
this change ensures that dumpsys of both services
show the same period.

Bug: 29253834
Change-Id: I0cd7f85da56af967963573a048c3a71436ed9c5b

8 years agoMerge \"Redraw if dirty during stopped when resumed\" into nyc-dev
John Reck [Tue, 14 Jun 2016 14:54:21 +0000 (14:54 +0000)]
Merge \"Redraw if dirty during stopped when resumed\" into nyc-dev
am: 5b4ff21a74

Change-Id: I75235a18c29939b4f221c8af664d5f7218660aed

8 years agoMerge "Redraw if dirty during stopped when resumed" into nyc-dev
John Reck [Tue, 14 Jun 2016 14:43:19 +0000 (14:43 +0000)]
Merge "Redraw if dirty during stopped when resumed" into nyc-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 7ce75172dd  -s ours

Change-Id: Ie8451e38f89fedd49445ff91b1d01fe93177292b

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 12:06:34 +0000 (12:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: bb8b32262f  -s ours

Change-Id: I711e22ef0d10409d81c1ed4352876697797b95a8

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:47:53 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:42 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev