OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Use constants for return value of TextView#doKeyDown"
Keisuke Kuroyanagi [Wed, 11 Nov 2015 02:35:18 +0000 (02:35 +0000)]
Merge "Use constants for return value of TextView#doKeyDown"

8 years agoAllow debugging only for apps forked from zygote am: f915991842 -s ours am: 48fdfa40...
Sebastien Hertz [Wed, 11 Nov 2015 01:27:41 +0000 (01:27 +0000)]
Allow debugging only for apps forked from zygote am: f915991842  -s ours am: 48fdfa403e am: f8c9e499c0
am: 000b17b51c

* commit '000b17b51c984cf88b9d57bcaffeaa831cf40dc8':
  Allow debugging only for apps forked from zygote

8 years agoAllow debugging only for apps forked from zygote am: f915991842 -s ours am: 48fdfa403e
Sebastien Hertz [Wed, 11 Nov 2015 01:20:27 +0000 (01:20 +0000)]
Allow debugging only for apps forked from zygote am: f915991842  -s ours am: 48fdfa403e
am: f8c9e499c0

* commit 'f8c9e499c0985c8893617e81dea75fbaaebee0d9':
  Allow debugging only for apps forked from zygote

8 years agoAllow debugging only for apps forked from zygote am: f915991842 -s ours
Sebastien Hertz [Wed, 11 Nov 2015 01:11:33 +0000 (01:11 +0000)]
Allow debugging only for apps forked from zygote am: f915991842  -s ours
am: 48fdfa403e

* commit '48fdfa403eef469ea9bbcbf5509d919b7db447c7':
  Allow debugging only for apps forked from zygote

8 years agoAllow debugging only for apps forked from zygote
Sebastien Hertz [Wed, 11 Nov 2015 01:02:21 +0000 (01:02 +0000)]
Allow debugging only for apps forked from zygote
am: f915991842  -s ours

* commit 'f91599184200e4e5f5b8bb01f9e7274d21a3dc9d':
  Allow debugging only for apps forked from zygote

8 years agoMerge "Add microbench for PathParser"
Doris Liu [Wed, 11 Nov 2015 00:44:57 +0000 (00:44 +0000)]
Merge "Add microbench for PathParser"

8 years agoAdd microbench for PathParser
Doris Liu [Tue, 10 Nov 2015 18:36:17 +0000 (10:36 -0800)]
Add microbench for PathParser

Change-Id: I95d6c3153480e3ea56032ffe73707110186fbb0f

8 years agoMerge "VectorDrawable native rendering - Step 1 of MANY"
Doris Liu [Wed, 11 Nov 2015 00:36:27 +0000 (00:36 +0000)]
Merge "VectorDrawable native rendering - Step 1 of MANY"

8 years agoMerge "app shelf: Change logging level"
Xiaohui Chen [Wed, 11 Nov 2015 00:23:44 +0000 (00:23 +0000)]
Merge "app shelf: Change logging level"

8 years agoVectorDrawable native rendering - Step 1 of MANY
Doris Liu [Wed, 4 Nov 2015 22:56:24 +0000 (14:56 -0800)]
VectorDrawable native rendering - Step 1 of MANY

Implement path parsing from string to skia path in native. The parsing
contains two main stages:
1) Parse string into a list of nodes that contains one operation (such
   as move) and a vector of floats as params for that operation.
2) Interpret the operations defined in the nodes into SkPath operations,
   and create a skia path

Also provided unit test for parsing a string path into a list of nodes,
and then to a skia path.

Change-Id: I0ce13df5e3bb90987dcdc80fe8b039af175ad2e2

8 years agoMerge "Fix HWUI Path Cache dangling pointer" am: 37bf3ec9d2 am: 7516d4d866
John Reck [Tue, 10 Nov 2015 23:36:27 +0000 (23:36 +0000)]
Merge "Fix HWUI Path Cache dangling pointer" am: 37bf3ec9d2 am: 7516d4d866
am: 1b85ce17a3

* commit '1b85ce17a316973a170b3932f2d0a9b02063eaa3':
  Fix HWUI Path Cache dangling pointer

8 years agoMerge "Fix HWUI Path Cache dangling pointer" am: 37bf3ec9d2
John Reck [Tue, 10 Nov 2015 23:31:11 +0000 (23:31 +0000)]
Merge "Fix HWUI Path Cache dangling pointer" am: 37bf3ec9d2
am: 7516d4d866

* commit '7516d4d8667957688433b02b2f4985f1b3ab36ad':
  Fix HWUI Path Cache dangling pointer

8 years agoMerge "Fix HWUI Path Cache dangling pointer"
John Reck [Tue, 10 Nov 2015 23:26:01 +0000 (23:26 +0000)]
Merge "Fix HWUI Path Cache dangling pointer"
am: 37bf3ec9d2

* commit '37bf3ec9d2fb3dfdccfe043e51723e4e543f0703':
  Fix HWUI Path Cache dangling pointer

8 years agoAllow debugging only for apps forked from zygote
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote

When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
(cherry picked from commit ff8dc21278b19b22ed8dc9f9475850838336d351)

8 years agoMerge "Fix HWUI Path Cache dangling pointer"
John Reck [Tue, 10 Nov 2015 23:20:03 +0000 (23:20 +0000)]
Merge "Fix HWUI Path Cache dangling pointer"

8 years agoapp shelf: Change logging level
Xiaohui Chen [Tue, 10 Nov 2015 23:02:29 +0000 (15:02 -0800)]
app shelf: Change logging level

It seems common for apk to not have launcher activity. I see it quite
a lot during SUW. It does not seems to be an error.

Change-Id: Iee417b0614ef17940371da9710ff14adbad82e3a

8 years agoMerge "Do not call into ActivityManager from DPMS within DPMS lock"
Makoto Onuki [Tue, 10 Nov 2015 22:57:05 +0000 (22:57 +0000)]
Merge "Do not call into ActivityManager from DPMS within DPMS lock"

8 years agoDo not call into ActivityManager from DPMS within DPMS lock
Makoto Onuki [Sat, 7 Nov 2015 01:08:01 +0000 (17:08 -0800)]
Do not call into ActivityManager from DPMS within DPMS lock

This will allow AMS to call into DPMS within the AMS lock instead,
which will help  I1537bd57b34696768ee81a979d53bb396efbc12a.

- AM.clearApplicationUserData() will not be allowed for any DA
apps.

Bug 25567963

Change-Id: I9f0d071c815a011be4f4c85c502c39d0fe0fe5e8

8 years agoMerge "Fix crash on invalid dimlayer"
Chong Zhang [Tue, 10 Nov 2015 22:24:10 +0000 (22:24 +0000)]
Merge "Fix crash on invalid dimlayer"

8 years agoFix crash on invalid dimlayer
Chong Zhang [Tue, 10 Nov 2015 22:05:40 +0000 (14:05 -0800)]
Fix crash on invalid dimlayer

If the app is already removed, don't apply any more dim on the window
that's pending removal. It causes invalid DimState to be added back
to the controller, and we crash as these don't have valid dimlayers.

bug: 25570092
Change-Id: I7e3c56c6eb636fdcb01d9bba90f77b3885e216fb

8 years agoMerge "Clarify geometry management for SurfaceView"
Rob Carr [Tue, 10 Nov 2015 21:54:45 +0000 (21:54 +0000)]
Merge "Clarify geometry management for SurfaceView"

8 years agoMerge "jni: Regenerated EGL/GLES JNI files to support null arguments"
Pablo Ceballos [Tue, 10 Nov 2015 21:41:53 +0000 (21:41 +0000)]
Merge "jni: Regenerated EGL/GLES JNI files to support null arguments"

8 years agoMerge "Fix threading issues"
John Reck [Tue, 10 Nov 2015 21:41:49 +0000 (21:41 +0000)]
Merge "Fix threading issues"

8 years agoFix threading issues
John Reck [Tue, 10 Nov 2015 20:52:44 +0000 (12:52 -0800)]
Fix threading issues

Bug: 25584167
Change-Id: I413ef9e0c86f7cca1f7d085e0071745ca0192853

8 years agoMerge "Improve MediaCodec.CryptoException log messages"
Jeff Tinker [Tue, 10 Nov 2015 21:16:44 +0000 (21:16 +0000)]
Merge "Improve MediaCodec.CryptoException log messages"

8 years agoMerge "Fix tuner-related crashes"
Jason Monk [Tue, 10 Nov 2015 21:05:57 +0000 (21:05 +0000)]
Merge "Fix tuner-related crashes"

8 years agoFix tuner-related crashes
Jason Monk [Tue, 10 Nov 2015 21:03:06 +0000 (16:03 -0500)]
Fix tuner-related crashes

 - Make the dialog a fragment
 - add a null check

Bug: 23341500
Bug: 25341011
Change-Id: I4d9991657c487ea3b5ced8cce2a5072c8adb2ee5

8 years agoClarify geometry management for SurfaceView
Robert Carr [Fri, 6 Nov 2015 21:54:20 +0000 (13:54 -0800)]
Clarify geometry management for SurfaceView

In the hardware accelerated case, RenderThread needs
to be the authority of information on the geometry of
the SurfaceView (this will occur via moving the
repositionWindow call to RenderThread). In order
to support this we have to enable calling relayoutWindow
without geometry (so that it will not fight with
repositionWindow). Add such a mode to relayoutWindow
and use it from SurfaceView. Add size to repositionChild
while we are here.

Bug: 22802885
Change-Id: Ie45132c22f34cc6ecfe2446912b30bd1df414406

8 years agoIntroduce socket stats tag for restore traffic
Christopher Tate [Tue, 10 Nov 2015 18:49:20 +0000 (10:49 -0800)]
Introduce socket stats tag for restore traffic

As well as system API for emplacing it.

Change-Id: If33fbd23552261efe3b00d75c22ff823564f43e6

8 years agoMerge "Saving additional context when taking task screenshots."
Winson Chung [Tue, 10 Nov 2015 18:24:48 +0000 (18:24 +0000)]
Merge "Saving additional context when taking task screenshots."

8 years agoMerge "Fixed issue with not been able to dock task from recents after reboot"
Wale Ogunwale [Tue, 10 Nov 2015 18:07:56 +0000 (18:07 +0000)]
Merge "Fixed issue with not been able to dock task from recents after reboot"

8 years agoFixed issue with not been able to dock task from recents after reboot
Wale Ogunwale [Tue, 10 Nov 2015 15:52:22 +0000 (07:52 -0800)]
Fixed issue with not been able to dock task from recents after reboot

- Always set the docked stack mode when starting a task from recents
even if the task is already in the docked stack. The caller might want
to change the docked stack location.
- Return last persisted bounds for task that hasn't be restored into a
stack yet when AMS.getTaskBounds is called.
- Make sure there is a valid top activity when moving a task to a stack
before trying to preserve the window.

Bug: 25590206
Change-Id: Id115fc62c28913f999c62cdbbaccd887daa0fab5

8 years agoMerge "Move RecentLocationApps to SettingsLib"
Tony Mantler [Tue, 10 Nov 2015 17:48:47 +0000 (17:48 +0000)]
Merge "Move RecentLocationApps to SettingsLib"

8 years agoMove RecentLocationApps to SettingsLib
Tony Mantler [Wed, 4 Nov 2015 23:52:25 +0000 (15:52 -0800)]
Move RecentLocationApps to SettingsLib

Change-Id: I73c7c7a2436a6af9f5353a20ea7afc4f6e57b485

8 years agoMerge "Fix persistent Canvas clip handling"
Florin Malita [Tue, 10 Nov 2015 16:59:48 +0000 (16:59 +0000)]
Merge "Fix persistent Canvas clip handling"

8 years agoFixing issue with regression with launching focused task.
Winson [Mon, 9 Nov 2015 18:39:57 +0000 (10:39 -0800)]
Fixing issue with regression with launching focused task.

- Only update the focused task as you scroll if we are in touch
  exploration mode.
- Use stack's notion of focused task as the currently focused task may
  not have a TaskView and can be scrolled offscreen.

Bug: 25590404

Change-Id: I5ef1b66ec74aa1a3131993ed84905210f1e45f18

8 years agoMake sure callback is only called once
Jorim Jaggi [Tue, 10 Nov 2015 15:06:54 +0000 (16:06 +0100)]
Make sure callback is only called once

Because we set it already in the future, it was called already
when we fetched the contents of the future, because it looked
like we overrided the callback. Instead, don't do callbacks
when calling the future, and save the callback in a separate
field.

Bug: 25568693
Change-Id: I8b7fd4248a2336470f8b7e12b64b0577dee96f6f

8 years agoMerge "Add ACTION_PROVISION_MANAGED_USER"
Mahaver Chopra [Tue, 10 Nov 2015 14:08:02 +0000 (14:08 +0000)]
Merge "Add ACTION_PROVISION_MANAGED_USER"

8 years agoReset mAppTransitionAnimationSpecs so they are only used once
Jorim Jaggi [Mon, 9 Nov 2015 13:33:20 +0000 (14:33 +0100)]
Reset mAppTransitionAnimationSpecs so they are only used once

Because we didn't reset it after sending it to window manager,
they were used again in the next transition, leading to a
wrong animation.

Also fix a bug where we waited forever because
getAppTransitionAnimationSpecs returned null.

Bug: 25583739
Change-Id: Ifcccf2d3cee649f66b4ded1d92c059acfa02ba5b

8 years agoWhen recent changes its layout, update contents
Jorim Jaggi [Mon, 9 Nov 2015 14:28:34 +0000 (15:28 +0100)]
When recent changes its layout, update contents

When the window gets resized, we need to synchronize the
views with the model.

Bug: 25584567
Bug: 25584399
Change-Id: I27d6738cb4984ce91ce79671298bcdc0d317c6e1

8 years agoAdd ACTION_PROVISION_MANAGED_USER
Mahaver Chopra [Thu, 5 Nov 2015 11:55:12 +0000 (11:55 +0000)]
Add ACTION_PROVISION_MANAGED_USER

Adding ACTION_PROVISION_MANAGED_USER to DevicePolicyManager.

Bug: 25462684
Change-Id: Ic90c3471f3a9c431d728197a19ab25b9946f090a

8 years agoMerge "Support KEYCODE_{CUT, COPY, PASTE} in TextView."
Keisuke Kuroyanagi [Tue, 10 Nov 2015 07:46:51 +0000 (07:46 +0000)]
Merge "Support KEYCODE_{CUT, COPY, PASTE} in TextView."

8 years agoMerge "Clean up/fix some minor focus-related code."
Ben Kwa [Tue, 10 Nov 2015 06:09:29 +0000 (06:09 +0000)]
Merge "Clean up/fix some minor focus-related code."

8 years agoMerge "Clean up some unnecessary imports."
Ben Kwa [Tue, 10 Nov 2015 05:16:39 +0000 (05:16 +0000)]
Merge "Clean up some unnecessary imports."

8 years agoMerge "Make folders unselectable in as needed."
Steve McKay [Tue, 10 Nov 2015 04:46:51 +0000 (04:46 +0000)]
Merge "Make folders unselectable in as needed."

8 years agoMake folders unselectable in as needed.
Steve McKay [Mon, 9 Nov 2015 08:38:35 +0000 (17:38 +0900)]
Make folders unselectable in as needed.

In some intent handling modes folders shouldn't be selectable.

Note: There are probably *other* conditions where this should be true too.

Bug: 23936872
Change-Id: I5a1f6853df265d65415cc09e95005720bf5f91d7

8 years agoMerge "Don't treat dummy animation as exit animation."
Filip Gruszczynski [Tue, 10 Nov 2015 04:23:56 +0000 (04:23 +0000)]
Merge "Don't treat dummy animation as exit animation."

8 years agoMerge "Clear task bounds data when removing non-bounds persistable task."
Wale Ogunwale [Tue, 10 Nov 2015 03:52:28 +0000 (03:52 +0000)]
Merge "Clear task bounds data when removing non-bounds persistable task."

8 years agoMerge "Avoid NPE in printspooler when changing language" am: 8d8515e708 am: 5522efb130
Svetoslav Ganov [Tue, 10 Nov 2015 02:36:02 +0000 (02:36 +0000)]
Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708 am: 5522efb130
am: 16009a6dea

* commit '16009a6deaff272c94046facbeb567bafdaacc69':
  Avoid NPE in printspooler when changing language

8 years agoDon't treat dummy animation as exit animation.
Filip Gruszczynski [Tue, 10 Nov 2015 02:17:07 +0000 (18:17 -0800)]
Don't treat dummy animation as exit animation.

This fixes a problem where recents would never be removed, because they
would run a dummy animation.

Bug: 25472312
Change-Id: I5767dc700966a49513e6338f4728c2ff275628ad

8 years agoMerge "Fix jumping dock divider when dismissing/maximizng."
Filip Gruszczynski [Tue, 10 Nov 2015 02:16:55 +0000 (02:16 +0000)]
Merge "Fix jumping dock divider when dismissing/maximizng."

8 years agoSaving additional context when taking task screenshots.
Winson [Mon, 2 Nov 2015 20:06:15 +0000 (12:06 -0800)]
Saving additional context when taking task screenshots.

- Save the original task size and screen orientation.  This ensures that
  we will be able to display the screenshots in the right orientation if
  we start taking non-square thumbnails.

Change-Id: I17ffe1fc05a447f67753149695a4eaf0baa36e8e

8 years agoMerge "Add root information to MtpDatabase."
Daichi Hirono [Tue, 10 Nov 2015 01:34:21 +0000 (01:34 +0000)]
Merge "Add root information to MtpDatabase."

8 years agoAdd root information to MtpDatabase.
Daichi Hirono [Thu, 5 Nov 2015 02:56:12 +0000 (11:56 +0900)]
Add root information to MtpDatabase.

The CLs adds new table to MtpDatabase that contains additional
information to provide DocumentContract.Roots.COLUMN_*. Client code can
obtain these information by using the newly added queryRoots method.

BUG=25162822
Change-Id: Ib6596d38cbb4a42b689c75fffbd73585c0fb524c

8 years agoImprove MediaCodec.CryptoException log messages
Jeff Tinker [Tue, 10 Nov 2015 01:31:05 +0000 (17:31 -0800)]
Improve MediaCodec.CryptoException log messages

The message being logged is "Unknown error" even for
known error types.  This change provides more descriptive
error strings, for the case when the message isn't
explicitly provided by the DRM plugin.

Change-Id: Ic86478d7685cd33e21ecd2f875ef7dbed351e52e
related-to-bug: 25477595

8 years agoMerge "Fix case where some locales may have empty langauges."
Roozbeh Pournader [Tue, 10 Nov 2015 01:13:50 +0000 (01:13 +0000)]
Merge "Fix case where some locales may have empty langauges."

8 years agoMerge "Move 'un/install' to cmd"
Todd Kennedy [Tue, 10 Nov 2015 01:12:32 +0000 (01:12 +0000)]
Merge "Move 'un/install' to cmd"

8 years agoFix case where some locales may have empty langauges.
Roozbeh Pournader [Tue, 10 Nov 2015 01:09:15 +0000 (17:09 -0800)]
Fix case where some locales may have empty langauges.

This is to make the behvior the same as before
47f71a697a50e76565fef520a0f51e5d6826ceee for cases when some of the
locales' languages are empty.

Change-Id: Ifee92e199f20130e060670f244eb3b4b7be13872

8 years agoMerge "Avoid NPE in printspooler when changing language" am: 8d8515e708
Svetoslav Ganov [Tue, 10 Nov 2015 01:07:27 +0000 (01:07 +0000)]
Merge "Avoid NPE in printspooler when changing language" am: 8d8515e708
am: 5522efb130

* commit '5522efb1300cfa87a8434bd396093a2ae076fa69':
  Avoid NPE in printspooler when changing language

8 years agoMerge "Avoid NPE in printspooler when changing language"
Svetoslav Ganov [Tue, 10 Nov 2015 01:03:05 +0000 (01:03 +0000)]
Merge "Avoid NPE in printspooler when changing language"
am: 8d8515e708

* commit '8d8515e708f0cebf69587750bbb3abcb315cc61e':
  Avoid NPE in printspooler when changing language

8 years agoMerge "Avoid NPE in printspooler when changing language"
Svetoslav Ganov [Tue, 10 Nov 2015 00:58:28 +0000 (00:58 +0000)]
Merge "Avoid NPE in printspooler when changing language"

8 years agoMerge "Don't hide wallpaper if surface is destroyed due to drag resizing"
Chong Zhang [Tue, 10 Nov 2015 00:55:25 +0000 (00:55 +0000)]
Merge "Don't hide wallpaper if surface is destroyed due to drag resizing"

8 years agoMerge "Temporarily disable to fix deadlock."
Jeff Sharkey [Tue, 10 Nov 2015 00:53:46 +0000 (00:53 +0000)]
Merge "Temporarily disable to fix deadlock."

8 years agoTemporarily disable to fix deadlock.
Jeff Sharkey [Tue, 10 Nov 2015 00:50:41 +0000 (16:50 -0800)]
Temporarily disable to fix deadlock.

Bug: 25584022
Change-Id: Icee579cfebfb75c573e9a54622f219e0f81fbd35

8 years agoMerge "Use the full locale list in resourceQualifierString()."
Roozbeh Pournader [Tue, 10 Nov 2015 00:45:49 +0000 (00:45 +0000)]
Merge "Use the full locale list in resourceQualifierString()."

8 years agoMerge "Added getServiceState API to TelephonyManager."
Jack Yu [Tue, 10 Nov 2015 00:34:04 +0000 (00:34 +0000)]
Merge "Added getServiceState API to TelephonyManager."

8 years agoMerge "Fix crash on calling removeSelection with showing selection handlers"
Yoshiki Iguchi [Tue, 10 Nov 2015 00:27:27 +0000 (00:27 +0000)]
Merge "Fix crash on calling removeSelection with showing selection handlers"

8 years agoMerge "Extend MediaCodec.CryptoInfo to support Sample AES"
Jeff Tinker [Mon, 9 Nov 2015 23:11:21 +0000 (23:11 +0000)]
Merge "Extend MediaCodec.CryptoInfo to support Sample AES"

8 years agoMove 'un/install' to cmd
Todd Kennedy [Wed, 4 Nov 2015 01:08:55 +0000 (17:08 -0800)]
Move 'un/install' to cmd

Move the implementation of the install variants and uninstall to the cmd
command. Additionally, make two other important changes: 1) replace calls
to the legacy PackageManager#installPackageAsUser with the PackageInstaller
2) allow streaming package bits for 'pm install'

Change-Id: I5680f57208d377daadb69b2cc09c233c02fe5016

8 years agoMerge "Add tests for calling end() before start() on ValueAnimator"
Doris Liu [Mon, 9 Nov 2015 22:52:41 +0000 (22:52 +0000)]
Merge "Add tests for calling end() before start() on ValueAnimator"

8 years agoMerge "Fix animator sometimes not being ended when end() is called without start...
Doris Liu [Mon, 9 Nov 2015 22:52:24 +0000 (22:52 +0000)]
Merge "Fix animator sometimes not being ended when end() is called without start()'ing"

8 years agoDon't hide wallpaper if surface is destroyed due to drag resizing
Chong Zhang [Mon, 9 Nov 2015 22:41:42 +0000 (14:41 -0800)]
Don't hide wallpaper if surface is destroyed due to drag resizing

We change surface from small to fullscreen size upon resizing,
and keep the old surface around until first draw finishes on the
new surface. This shouln't affect wallpaper. Hiding the wallpaper
causes the background to black out on every surface mode toggle.

bug: 25439788
Change-Id: I28c957dfaf1cc7f28e28cc00d8e97b8efb905349

8 years agoFix animator sometimes not being ended when end() is called without start()'ing
Doris Liu [Mon, 9 Nov 2015 22:44:35 +0000 (14:44 -0800)]
Fix animator sometimes not being ended when end() is called without start()'ing

Bug: 23713124
Change-Id: I2e00cedb9c74e14d2361579bba89d3d1dbfe4d22

8 years agoAdd tests for calling end() before start() on ValueAnimator
Doris Liu [Mon, 9 Nov 2015 22:41:07 +0000 (14:41 -0800)]
Add tests for calling end() before start() on ValueAnimator

Bug: 23713124
Change-Id: I55c86a43249fd36a9e633a6f75d6316c2e69ec61

8 years agoMerge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2...
Jeff Sharkey [Mon, 9 Nov 2015 22:41:02 +0000 (22:41 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 am: e6538dcc06 am: d9c10d7edd
am: ab62877a07  -s ours

* commit 'ab62877a077376bccb1230f1ab4a22c41441d2d9':
  Block directory selection in openable modes.

8 years agoAdded getServiceState API to TelephonyManager.
Jack Yu [Mon, 9 Nov 2015 19:32:29 +0000 (11:32 -0800)]
Added getServiceState API to TelephonyManager.

Added the new API getServiceState to TelephonyManager so
the client can directly retrieve the service state without
being a phone state listener or broadcast receiver.

bug: 21207640
Change-Id: Icef46877bbc844d382cd910b15abd8f6b1d57b23

8 years agoFix jumping dock divider when dismissing/maximizng.
Filip Gruszczynski [Mon, 9 Nov 2015 22:01:21 +0000 (14:01 -0800)]
Fix jumping dock divider when dismissing/maximizng.

Bug: 25590262
Change-Id: I7e3f145fde7fa763a81807163a206ba8971c65f1

8 years agoMerge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2...
Jeff Sharkey [Mon, 9 Nov 2015 21:58:49 +0000 (21:58 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2 am: e6538dcc06
am: d9c10d7edd

* commit 'd9c10d7edd52f5c1efb6d40f1c36b376b7a34934':
  Block directory selection in openable modes.

8 years agoMerge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2
Jeff Sharkey [Mon, 9 Nov 2015 21:53:02 +0000 (21:53 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev am: 00765ef5a2
am: e6538dcc06

* commit 'e6538dcc06c2547ac8a58c265e6b586fc9652ef3':
  Block directory selection in openable modes.

8 years agoMerge "Block directory selection in openable modes." into mnc-dr-dev
Jeff Sharkey [Mon, 9 Nov 2015 21:46:06 +0000 (21:46 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev
am: 00765ef5a2

* commit '00765ef5a2a0981d18a15f3acaf4119592d42996':
  Block directory selection in openable modes.

8 years agoMerge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec...
Marco Nelissen [Mon, 9 Nov 2015 21:46:06 +0000 (21:46 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed am: 02bf433f90 am: 8fb0121cb6
am: b67ae42ad0

* commit 'b67ae42ad07ed6a5b4927c41089076e6eafd6949':
  Fix race condition when setting default ringtones

8 years agoMerge "Block directory selection in openable modes." into mnc-dr-dev
Jeff Sharkey [Mon, 9 Nov 2015 21:40:29 +0000 (21:40 +0000)]
Merge "Block directory selection in openable modes." into mnc-dr-dev

8 years agoMerge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec...
Marco Nelissen [Mon, 9 Nov 2015 21:39:41 +0000 (21:39 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed am: 02bf433f90
am: 8fb0121cb6

* commit '8fb0121cb60ddf54a22bff088670594f422edea9':
  Fix race condition when setting default ringtones

8 years agoMerge "Fix no thumbnail animation from app to recents."
Filip Gruszczynski [Mon, 9 Nov 2015 21:37:40 +0000 (21:37 +0000)]
Merge "Fix no thumbnail animation from app to recents."

8 years agoMerge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed
Marco Nelissen [Mon, 9 Nov 2015 21:34:14 +0000 (21:34 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev am: 83702ec3ed
am: 02bf433f90

* commit '02bf433f902aa34483aa2fc1b410f393b35058f1':
  Fix race condition when setting default ringtones

8 years agoMerge "Fix race condition when setting default ringtones" into mnc-dr-dev
Marco Nelissen [Mon, 9 Nov 2015 21:28:32 +0000 (21:28 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev
am: 83702ec3ed

* commit '83702ec3edf3bd17eff90a409cc3cf5efab48cff':
  Fix race condition when setting default ringtones

8 years agoMerge "Fix race condition when setting default ringtones" into mnc-dr-dev
Marco Nelissen [Mon, 9 Nov 2015 21:21:55 +0000 (21:21 +0000)]
Merge "Fix race condition when setting default ringtones" into mnc-dr-dev

8 years agoMerge "Added removed null checks around calls to WindowSurfaceController"
Wale Ogunwale [Mon, 9 Nov 2015 21:12:07 +0000 (21:12 +0000)]
Merge "Added removed null checks around calls to WindowSurfaceController"

8 years agoFix no thumbnail animation from app to recents.
Filip Gruszczynski [Mon, 9 Nov 2015 21:05:40 +0000 (13:05 -0800)]
Fix no thumbnail animation from app to recents.

Bug: 25584190

Change-Id: Ifdb7e51f077ddeff907c1e23c925cd374ed794b0

8 years agoAdded removed null checks around calls to WindowSurfaceController
Wale Ogunwale [Mon, 9 Nov 2015 20:42:37 +0000 (12:42 -0800)]
Added removed null checks around calls to WindowSurfaceController

The checks were removed in the refactor in
e6a8351bc715999d1e42dcc1003a6eda6c318dd9

Bug: 25564523
Change-Id: Ia7c571fa48bc5c14bb76c3aa5b6fcbcc7323ed2f

8 years agoMerge "system_server: allow /proc read access to other UIDs" am: 51b48b3877 am: 02cc3...
Nick Kralevich [Mon, 9 Nov 2015 20:40:22 +0000 (20:40 +0000)]
Merge "system_server: allow /proc read access to other UIDs" am: 51b48b3877 am: 02cc328d9d
am: 7907271af1

* commit '7907271af1f9024b1c5896a2d5006f7c868c771c':
  system_server: allow /proc read access to other UIDs

8 years agoMerge "system_server: allow /proc read access to other UIDs" am: 51b48b3877
Nick Kralevich [Mon, 9 Nov 2015 20:34:02 +0000 (20:34 +0000)]
Merge "system_server: allow /proc read access to other UIDs" am: 51b48b3877
am: 02cc328d9d

* commit '02cc328d9df39a4abae55bf047a88a9e8129783d':
  system_server: allow /proc read access to other UIDs

8 years agoMerge "system_server: allow /proc read access to other UIDs"
Nick Kralevich [Mon, 9 Nov 2015 20:28:30 +0000 (20:28 +0000)]
Merge "system_server: allow /proc read access to other UIDs"
am: 51b48b3877

* commit '51b48b38774b8babe339890e1c888dfd8647ee72':
  system_server: allow /proc read access to other UIDs

8 years agoMerge "Fix blink when docking a window."
Filip Gruszczynski [Mon, 9 Nov 2015 20:13:12 +0000 (20:13 +0000)]
Merge "Fix blink when docking a window."

8 years agoMerge "system_server: allow /proc read access to other UIDs"
Nick Kralevich [Mon, 9 Nov 2015 20:05:22 +0000 (20:05 +0000)]
Merge "system_server: allow /proc read access to other UIDs"

8 years agoMerge "Allow activities to show on user 0 until provisioned"
Amith Yamasani [Mon, 9 Nov 2015 19:50:50 +0000 (19:50 +0000)]
Merge "Allow activities to show on user 0 until provisioned"

8 years agoDon't crash if cannot persist settings
Svetoslav [Mon, 9 Nov 2015 19:45:34 +0000 (11:45 -0800)]
Don't crash if cannot persist settings

bug:23569962

Change-Id: I19fd7d37b6de251696d119cfc33e87e9743b2029

8 years agoCEC: Validate <Vendor Command> correctly
Jinsuk Kim [Fri, 16 Oct 2015 06:15:18 +0000 (15:15 +0900)]
CEC: Validate <Vendor Command> correctly

The command always has one or more bytes for its parameter, so
the right validation should have been the one ensuring the number
of bytes (1 ~ 14).

Bug: 24986703
Change-Id: I171e971f1649761d69ffe2aa0af364f34dc9ac3e
(cherry picked from commit 4808581f4dfdf04adcd2646e152dede0ce418cad)

8 years agoCEC: Queue up callbacks to handle on final result
Jinsuk Kim [Mon, 12 Oct 2015 23:22:09 +0000 (08:22 +0900)]
CEC: Queue up callbacks to handle on final result

While one party calls oneTouchPlay() to initiate the action and
put it in progress, the other parties making the same call gets
an error 'operation in progress'. This is not really an error,
but there was no other choice for them but just to wait till
the action is completed and the service is ready to accept
the API call again.

This CL resolves the inconvenice by allowing multiple callbacks
rather than returning IN_PROGRESS for those joining later. Same
was applied to queryDisplayStatus().

Change-Id: I5fc9aba4aa73e76a25f8fdec37e11cd961a3d35f
(cherry picked from commit 98a25f1ee27c1b4362a23981edc17fc92199a876)

8 years agoClear task bounds data when removing non-bounds persistable task.
Wale Ogunwale [Mon, 9 Nov 2015 19:14:10 +0000 (11:14 -0800)]
Clear task bounds data when removing non-bounds persistable task.

Bug: 25584169
Change-Id: Ie68fa12bf182e988077e6410197f7f497f839ba2