OSDN Git Service

android-x86/frameworks-base.git
8 years agoOnly call Drawable.setVisible(false) for visible outgoing drawables
Adam Powell [Tue, 22 Mar 2016 17:40:29 +0000 (10:40 -0700)]
Only call Drawable.setVisible(false) for visible outgoing drawables

In framework views where we're handling the new visibility aggregated
call we only update the drawable visibility when we're attached to a
window. For old outgoing drawables being replaced, gate this on
whether the drawable is already marked visible instead.

This catches a case where views being inflated might set drawables in
in a superclass constructor and have them replaced in a later
constructor. Gating the call into a drawable that might invoke its
callback (the view being constructed) avoids potential problems where
overridden methods are called unexpectedly on a view subclass that has
not finished running its constructor.

This is a better check than isAttachedToWindow, as isAttachedToWindow
will return false if the view has been temporarily detached from its
parent by a view-recycling container. In those cases, the view would
not correctly update the outgoing drawable.

Bug 27461617

Change-Id: I733a2dd3e3df0a8d80d5dc542ca7b30064159d5d

8 years agoMerge "Make DISK_SCANNED a protected broadcast." into nyc-dev
Jeff Sharkey [Tue, 22 Mar 2016 15:13:25 +0000 (15:13 +0000)]
Merge "Make DISK_SCANNED a protected broadcast." into nyc-dev

8 years agoMerge "Only enable asserts on userdebug/eng builds." into nyc-dev
Jeff Sharkey [Tue, 22 Mar 2016 15:13:12 +0000 (15:13 +0000)]
Merge "Only enable asserts on userdebug/eng builds." into nyc-dev

8 years agoMerge "Store trace files in app-specific dirs." into nyc-dev
Jeff Sharkey [Tue, 22 Mar 2016 15:12:43 +0000 (15:12 +0000)]
Merge "Store trace files in app-specific dirs." into nyc-dev

8 years agoMerge "Delete dead code." into nyc-dev
Lorenzo Colitti [Tue, 22 Mar 2016 11:40:27 +0000 (11:40 +0000)]
Merge "Delete dead code." into nyc-dev

8 years agoMerge "Clean up some javadoc issues" into nyc-dev
Benjamin Franz [Tue, 22 Mar 2016 11:30:46 +0000 (11:30 +0000)]
Merge "Clean up some javadoc issues" into nyc-dev

8 years agoClean up some javadoc issues
Benjamin Franz [Mon, 21 Mar 2016 15:45:56 +0000 (15:45 +0000)]
Clean up some javadoc issues

Bug: 27672974
Bug: 25881314
Change-Id: Ida53e3bf23b2492c26f4a82878fa192110a8794f

8 years agoMerge "Revert "Open drawer when showing copy/move destination screen"" into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 10:46:43 +0000 (10:46 +0000)]
Merge "Revert "Open drawer when showing copy/move destination screen"" into nyc-dev

8 years agoRevert "Open drawer when showing copy/move destination screen"
Daichi Hirono [Tue, 22 Mar 2016 10:40:56 +0000 (19:40 +0900)]
Revert "Open drawer when showing copy/move destination screen"

This reverts commit 4d5f9f6a7f3b9aa8f7fd1a733ba739e5bfe3ed66.
The CL breaks android.appsecurity.cts.DocumentsTest.

BUG: 2774611627479369
Change-Id: Ib9426c54e8c9841f3def55a88e07bf4a2cd7dcac

8 years agoMerge "Notify via TalkBack about selected items." into nyc-dev
Tomasz Mikolajewski [Tue, 22 Mar 2016 09:40:50 +0000 (09:40 +0000)]
Merge "Notify via TalkBack about selected items." into nyc-dev

8 years agoMerge "Fix null pointer exception when MTP/PTP device is detached." into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 08:55:58 +0000 (08:55 +0000)]
Merge "Fix null pointer exception when MTP/PTP device is detached." into nyc-dev

8 years agoNotify via TalkBack about selected items.
Tomasz Mikolajewski [Tue, 22 Mar 2016 07:43:59 +0000 (16:43 +0900)]
Notify via TalkBack about selected items.

Bug: 27723098
Change-Id: I6927b004b3e5a592325646ae3a4663bb298a65c8

8 years agoMerge "Support registering a request for the default network" into nyc-dev
Erik Kline [Tue, 22 Mar 2016 07:28:06 +0000 (07:28 +0000)]
Merge "Support registering a request for the default network" into nyc-dev

8 years agoDelete dead code.
Lorenzo Colitti [Tue, 22 Mar 2016 07:27:41 +0000 (16:27 +0900)]
Delete dead code.

Change-Id: If8052efaa00f15e5c7eb038435be33206d54276a

8 years agoMerge "PIP: Increase the PIP menu's char limits for translation" into nyc-dev
Jaewan Kim [Tue, 22 Mar 2016 07:19:35 +0000 (07:19 +0000)]
Merge "PIP: Increase the PIP menu's char limits for translation" into nyc-dev

8 years agoSupport registering a request for the default network
Erik Kline [Wed, 16 Mar 2016 06:31:39 +0000 (15:31 +0900)]
Support registering a request for the default network

Change-Id: I079f5be97b585cf5692dd4c7a144b993d168a9a5

8 years agoMerge "ExifInterface: fix logs" into nyc-dev
Jaesung Chung [Tue, 22 Mar 2016 05:39:25 +0000 (05:39 +0000)]
Merge "ExifInterface: fix logs" into nyc-dev

8 years agoMerge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev
Jaesung Chung [Tue, 22 Mar 2016 05:38:26 +0000 (05:38 +0000)]
Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev

8 years agoMerge "Remove framework code that calls SIOCKILLADDR" into nyc-dev
Lorenzo Colitti [Tue, 22 Mar 2016 05:37:07 +0000 (05:37 +0000)]
Merge "Remove framework code that calls SIOCKILLADDR" into nyc-dev

8 years agoExifInterface: fix logs
Jaesung Chung [Sun, 20 Mar 2016 08:21:18 +0000 (01:21 -0700)]
ExifInterface: fix logs

- Give more explanations on dealing with files failed to process.
- Log and return immediately when handling lost JPEG files.
- Minor fixes in logging.

Bug: 27583378, Bug: 27587980
Change-Id: Id9a3d137e5f173fa0e6313402e5dc482a5efd57c

8 years agoMerge "Don't map root documents in DocumentLoader." into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 04:47:55 +0000 (04:47 +0000)]
Merge "Don't map root documents in DocumentLoader." into nyc-dev

8 years agoDon't map root documents in DocumentLoader.
Daichi Hirono [Fri, 18 Mar 2016 08:34:29 +0000 (17:34 +0900)]
Don't map root documents in DocumentLoader.

Root documents must be added by RootScanner.
Previously DocumentLoader unintentionally tries to load unmapped root
documents, which causes crash.

BUG=27731902

Change-Id: I8674473d80d6e7f758f6636d30148f5d2118bc25

8 years agoMerge "Add root flag correctly." into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 04:43:10 +0000 (04:43 +0000)]
Merge "Add root flag correctly." into nyc-dev

8 years agoAdd root flag correctly.
Daichi Hirono [Fri, 18 Mar 2016 06:25:00 +0000 (15:25 +0900)]
Add root flag correctly.

BUG=27369570

Change-Id: I93b9b662667009a374d879c7ab667b10fb7cbf7c

8 years agoMerge "Count error document to complete adding documents to the database." into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 04:42:03 +0000 (04:42 +0000)]
Merge "Count error document to complete adding documents to the database." into nyc-dev

8 years agoCount error document to complete adding documents to the database.
Daichi Hirono [Fri, 18 Mar 2016 06:05:53 +0000 (15:05 +0900)]
Count error document to complete adding documents to the database.

Previously DocumentLoader#LoaderTask had a counter to count loaded
documents and completes adding documents to the database.  However it
does not count documents where a MTP device returns an error for
getObjectInfo. The CL fixes the problem to ensure we complete documents
loading.

BUG=27729653

Change-Id: I696eac790a6535f1bd7a1855dc2d6f932e32eae5

8 years agoPIP: Increase the PIP menu's char limits for translation
Jaewan Kim [Mon, 21 Mar 2016 02:52:53 +0000 (11:52 +0900)]
PIP: Increase the PIP menu's char limits for translation

Bug: 27699763
Change-Id: I2ae0d44ecb30bf63c2229a9531d226fc5ddcd40d

8 years agoRemove framework code that calls SIOCKILLADDR
Lorenzo Colitti [Tue, 22 Mar 2016 03:54:32 +0000 (12:54 +0900)]
Remove framework code that calls SIOCKILLADDR

Bug: 26976388
Change-Id: I652361d9e650a77085070d6c26b28b7638ba2dfe

8 years agoMerge "PIP: Fix NPE when an activity is PIPed again immediately" into nyc-dev
Jaewan Kim [Tue, 22 Mar 2016 03:42:10 +0000 (03:42 +0000)]
Merge "PIP: Fix NPE when an activity is PIPed again immediately" into nyc-dev

8 years agoUpdate api/test-current.txt
Jakub Pawlowski [Fri, 18 Mar 2016 22:14:16 +0000 (15:14 -0700)]
Update api/test-current.txt

Change-Id: I1fa444fbe874862e6296ee6a9751c39a0cbc4b7a

8 years agoUse handles to identify GATT attributes (4/4)
Jakub Pawlowski [Thu, 17 Mar 2016 23:00:16 +0000 (16:00 -0700)]
Use handles to identify GATT attributes (4/4)

Bug: 27778668
Change-Id: I01e095939df2f8dc433f14b473957c815ecade74

8 years agoPIP: Fix NPE when an activity is PIPed again immediately
Jaewan Kim [Mon, 21 Mar 2016 08:34:28 +0000 (17:34 +0900)]
PIP: Fix NPE when an activity is PIPed again immediately

More proper fix would be not showing Recents after an activity is PIPed,
but NPE shouldn't be happen so let me propose the CL as the first step.

Bug: 27634771
Change-Id: Ie98293b7dd2d206567ded08d54134164aa78ca9c

8 years agoChange how services are passed up to the stack
Jakub Pawlowski [Wed, 2 Mar 2016 02:50:27 +0000 (18:50 -0800)]
Change how services are passed up to the stack

Right now we pass all services, characteristics and descriptors one by one.
This patch changes that - now we pass whole GATT database at once.

Bug: 27455533
Change-Id: Ie42cd80072538e411904b9c9b011a978f26158b9

8 years agoFix null pointer exception when MTP/PTP device is detached.
Daichi Hirono [Tue, 22 Mar 2016 02:05:22 +0000 (11:05 +0900)]
Fix null pointer exception when MTP/PTP device is detached.

FIXED=27743872

Change-Id: I9b754ba7efbc4958a47aafe332f1909bc0d50457

8 years agoMerge "Fix the logic to add suffix when copying." into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 01:34:58 +0000 (01:34 +0000)]
Merge "Fix the logic to add suffix when copying." into nyc-dev

8 years agoMerge "Clean up and rename TypefaceImpl" into nyc-dev
Sergei Vasilinetc [Tue, 22 Mar 2016 01:33:48 +0000 (01:33 +0000)]
Merge "Clean up and rename TypefaceImpl" into nyc-dev

8 years agoFix the logic to add suffix when copying.
Daichi Hirono [Fri, 18 Mar 2016 09:29:56 +0000 (18:29 +0900)]
Fix the logic to add suffix when copying.

Previously the logic add '.' even if the extension is empty.

BUG=27729309

Change-Id: I3fa4b09fea977b5c716ec5cbbbc7d9f4ab96db08

8 years agoMerge "Add USB_HOST_CONNECTED extra to ACTION_USB_STATE sticky intent." into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 01:21:11 +0000 (01:21 +0000)]
Merge "Add USB_HOST_CONNECTED extra to ACTION_USB_STATE sticky intent." into nyc-dev

8 years agoMerge "Change the title of DocumentsUI from "Files" to "Downloads"." into nyc-dev
Daichi Hirono [Tue, 22 Mar 2016 01:20:24 +0000 (01:20 +0000)]
Merge "Change the title of DocumentsUI from "Files" to "Downloads"." into nyc-dev

8 years agoMerge "PIP: Prevent PipOverlayActivity from restarting" into nyc-dev
Jaewan Kim [Tue, 22 Mar 2016 01:11:07 +0000 (01:11 +0000)]
Merge "PIP: Prevent PipOverlayActivity from restarting" into nyc-dev

8 years agoMerge "Hide system UI activity with FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS in Recents...
Jaewan Kim [Tue, 22 Mar 2016 00:34:17 +0000 (00:34 +0000)]
Merge "Hide system UI activity with FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS in Recents" into nyc-dev

8 years agoMerge "Reland: Move text logic from jni to hwui level" into nyc-dev
Sergei Vasilinetc [Tue, 22 Mar 2016 00:12:30 +0000 (00:12 +0000)]
Merge "Reland: Move text logic from jni to hwui level" into nyc-dev

8 years agoMerge "ShortcutManager: Clean up for uninstalled packages." into nyc-dev
Makoto Onuki [Tue, 22 Mar 2016 00:12:04 +0000 (00:12 +0000)]
Merge "ShortcutManager: Clean up for uninstalled packages." into nyc-dev

8 years agoMerge "Add API to read the current wallpaper's ID" into nyc-dev
Chris Tate [Tue, 22 Mar 2016 00:03:12 +0000 (00:03 +0000)]
Merge "Add API to read the current wallpaper's ID" into nyc-dev

8 years agoClean up and rename TypefaceImpl
sergeyv [Thu, 17 Mar 2016 18:24:22 +0000 (11:24 -0700)]
Clean up and rename TypefaceImpl

bug:25865834
Change-Id: I77e8a627163e040a5c25865054a8a936052af367

8 years agoMake DISK_SCANNED a protected broadcast.
Jeff Sharkey [Mon, 21 Mar 2016 23:05:49 +0000 (17:05 -0600)]
Make DISK_SCANNED a protected broadcast.

Bug: 27763115
Change-Id: Ib8b40ff9f4c1f929ac4f07a9d5460a0a593ba080

8 years agoOnly enable asserts on userdebug/eng builds.
Jeff Sharkey [Mon, 21 Mar 2016 23:04:02 +0000 (17:04 -0600)]
Only enable asserts on userdebug/eng builds.

Bug: 27699194
Change-Id: Id20f808448ae94371da62d38387f90ad97e7cbd3

8 years agoReland: Move text logic from jni to hwui level
sergeyv [Mon, 21 Mar 2016 22:38:21 +0000 (15:38 -0700)]
Reland: Move text logic from jni to hwui level

Initial CL: https://googleplex-android-review.git.corp.google.com/#/c/886854/

Change-Id: I9dfd85fe1d2a2c44f4360c8a29fd58d80e6f31c8

8 years agoShortcutManager: Clean up for uninstalled packages.
Makoto Onuki [Mon, 21 Mar 2016 22:47:52 +0000 (15:47 -0700)]
ShortcutManager: Clean up for uninstalled packages.

Bug 27548047

Change-Id: I95ca832af496fbf71023eb27a7e2647c124ffb86

8 years agoStore trace files in app-specific dirs.
Jeff Sharkey [Mon, 21 Mar 2016 22:42:57 +0000 (16:42 -0600)]
Store trace files in app-specific dirs.

The previous default location of "/sdcard" became painful to use
starting in M, because it required a runtime permission.  So now we
default to storing trace files in app-specific directories on shared
storage, which apps always have write access to with no additional
permissions.

Update docs to be consistent between all overloads.

Bug: 22807654
Change-Id: If4feca7c8778dfdf4ccce8cfb68418dc416260b5

8 years agoMerge "Don't finish resolver activity onStop if it is for home intent" into nyc-dev
Wale Ogunwale [Mon, 21 Mar 2016 22:53:09 +0000 (22:53 +0000)]
Merge "Don't finish resolver activity onStop if it is for home intent" into nyc-dev

8 years agoMerge "Add a comment about ResultReceiver lifetime." into nyc-dev
Yohei Yukawa [Mon, 21 Mar 2016 22:45:19 +0000 (22:45 +0000)]
Merge "Add a comment about ResultReceiver lifetime." into nyc-dev

8 years agoMerge "Add guard around getXmlFileParser() call" into nyc-dev
Deepanshu Gupta [Mon, 21 Mar 2016 22:45:11 +0000 (22:45 +0000)]
Merge "Add guard around getXmlFileParser() call" into nyc-dev

8 years agoAdd API to read the current wallpaper's ID
Christopher Tate [Mon, 21 Mar 2016 21:53:15 +0000 (14:53 -0700)]
Add API to read the current wallpaper's ID

Also regularize cross-user call handling throughout.

Bug 27743435

Change-Id: Ibc530d0576d657723a613888357a6ea71b482763

8 years agoMerge "Don't mix UI and print job state" into nyc-dev
Philip P. Moltmann [Mon, 21 Mar 2016 22:28:46 +0000 (22:28 +0000)]
Merge "Don't mix UI and print job state" into nyc-dev

8 years agoMerge "Fix string equality comparison" into nyc-dev
Paul Stewart [Mon, 21 Mar 2016 21:50:35 +0000 (21:50 +0000)]
Merge "Fix string equality comparison" into nyc-dev

8 years agoMerge "Ignore wildcard network policies." into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 21:11:56 +0000 (21:11 +0000)]
Merge "Ignore wildcard network policies." into nyc-dev

8 years agoMerge "Skip app widget config changes when user locked." into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 21:10:54 +0000 (21:10 +0000)]
Merge "Skip app widget config changes when user locked." into nyc-dev

8 years agoMerge "Check "Secure start-up" before toggling emulation." into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 21:10:33 +0000 (21:10 +0000)]
Merge "Check "Secure start-up" before toggling emulation." into nyc-dev

8 years agoMerge "Mark even more Bundles as defusable." into nyc-dev
Jeff Sharkey [Mon, 21 Mar 2016 21:10:13 +0000 (21:10 +0000)]
Merge "Mark even more Bundles as defusable." into nyc-dev

8 years agoAdd guard around getXmlFileParser() call
Deepanshu Gupta [Mon, 21 Mar 2016 21:07:20 +0000 (14:07 -0700)]
Add guard around getXmlFileParser() call

Prevents the need to update the LayoutLib API level.

Bug: http://b.android.com/202942
Change-Id: I507239148ab8d6d45406624dba569c8b7197f979

8 years agoMerge "Revert "Move text logic from jni to hwui level"" into nyc-dev
Sergei Vasilinetc [Mon, 21 Mar 2016 21:06:45 +0000 (21:06 +0000)]
Merge "Revert "Move text logic from jni to hwui level"" into nyc-dev

8 years agoRevert "Move text logic from jni to hwui level"
Sergei Vasilinetc [Mon, 21 Mar 2016 21:03:40 +0000 (21:03 +0000)]
Revert "Move text logic from jni to hwui level"

This reverts commit a7f6bba1a3565c19715e878dfe7f0e01022944ff.

Change-Id: If4f36f87a85411b6128fd92d391313803ccaf9dd

8 years agoMerge "Set drawable callbacks last" into nyc-dev
Alan Viverette [Mon, 21 Mar 2016 20:25:13 +0000 (20:25 +0000)]
Merge "Set drawable callbacks last" into nyc-dev

8 years agoMerge "Move text logic from jni to hwui level" into nyc-dev
Sergei Vasilinetc [Mon, 21 Mar 2016 20:11:25 +0000 (20:11 +0000)]
Merge "Move text logic from jni to hwui level" into nyc-dev

8 years agoMerge "Added support to specify animation duration when resizing stack" into nyc-dev
Wale Ogunwale [Mon, 21 Mar 2016 20:04:18 +0000 (20:04 +0000)]
Merge "Added support to specify animation duration when resizing stack" into nyc-dev

8 years agoDon't mix UI and print job state
Philip P. Moltmann [Mon, 21 Mar 2016 19:48:58 +0000 (12:48 -0700)]
Don't mix UI and print job state

In PrintActivity.OnPause we set the print job state based on the
PrintActivity state. The issue was that FINISHED was interpreted as
"cancel print job". Actually with FINISHED does not tell what state the
job should be in.

The only purpose of the finished state was to guard against
double-invocation of doFinish().

Hence remove this recently introduced state and use a simple boolean to
guard against doule invocation of doFinish().

Bug: 27760331
Change-Id: I0767c2b0b9c28e8904647cc832c236f67f92bcfe

8 years agoMerge "PowerManagerService: Adds a VrStateListener to track Vr Mode state changes...
Ruchi Kandoi [Mon, 21 Mar 2016 19:37:50 +0000 (19:37 +0000)]
Merge "PowerManagerService: Adds a VrStateListener to track Vr Mode state changes." into nyc-dev

8 years agoMerge "Move setup to earlier boot phase." into nyc-dev
Ruben Brunk [Mon, 21 Mar 2016 19:32:15 +0000 (19:32 +0000)]
Merge "Move setup to earlier boot phase." into nyc-dev

8 years agoMerge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev
Phil Burk [Mon, 21 Mar 2016 19:30:21 +0000 (19:30 +0000)]
Merge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev

8 years agoMerge "Account for top and bottom padding in ListPopupWindow" into nyc-dev
Alan Viverette [Mon, 21 Mar 2016 19:30:13 +0000 (19:30 +0000)]
Merge "Account for top and bottom padding in ListPopupWindow" into nyc-dev

8 years agoMerge "Handle unbounded drawPaint/drawGLFunction operations safely" into nyc-dev
Chris Craik [Mon, 21 Mar 2016 19:26:05 +0000 (19:26 +0000)]
Merge "Handle unbounded drawPaint/drawGLFunction operations safely" into nyc-dev

8 years agoIgnore wildcard network policies.
Jeff Sharkey [Mon, 21 Mar 2016 19:12:59 +0000 (13:12 -0600)]
Ignore wildcard network policies.

They never should have been persisted to disk in the first place.

Bug: 24972775
Change-Id: If9254f74455823f9fda9545fdf543fc7250a4016

8 years agoMove setup to earlier boot phase.
Ruben Brunk [Mon, 21 Mar 2016 19:10:38 +0000 (12:10 -0700)]
Move setup to earlier boot phase.

Bug: 27764094
Change-Id: I2a01b47129a3ef2a4ae37fbf98eb9ebe81061e62

8 years agoSkip app widget config changes when user locked.
Jeff Sharkey [Mon, 21 Mar 2016 19:07:32 +0000 (13:07 -0600)]
Skip app widget config changes when user locked.

Bug: 27377050
Change-Id: Ic63b06159cf59106b4e7bc62ec5f3e89d47321c5

8 years agoMerge "Don't copy Bitmaps when cloning RemoteViews" into nyc-dev
Adrian Roos [Mon, 21 Mar 2016 19:03:50 +0000 (19:03 +0000)]
Merge "Don't copy Bitmaps when cloning RemoteViews" into nyc-dev

8 years agoCheck "Secure start-up" before toggling emulation.
Jeff Sharkey [Mon, 21 Mar 2016 19:02:06 +0000 (13:02 -0600)]
Check "Secure start-up" before toggling emulation.

To fully emulate FBE we need to avoid the Cryptkeeper bounce, so
check to make sure user has disabled "Secure start-up" so vold can
unlock early during boot.

Bug: 27595501
Change-Id: Ic0d03f94982534381671e1039f14d1fd06bc0e4e

8 years agoMerge "Add guard around getXmlFileParser() call" into mnc-ub-dev
Deepanshu Gupta [Mon, 21 Mar 2016 18:59:59 +0000 (18:59 +0000)]
Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev
am: 8662173  -s ours

* commit '86621737fc1ba2d6ce7cb97e61fc8ce186eb851a':
  Add guard around getXmlFileParser() call

8 years agoMerge "Add guard around getXmlFileParser() call" into mnc-ub-dev
Deepanshu Gupta [Mon, 21 Mar 2016 18:53:55 +0000 (18:53 +0000)]
Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev

8 years agoFix string equality comparison
Paul Stewart [Mon, 21 Mar 2016 16:51:27 +0000 (09:51 -0700)]
Fix string equality comparison

Don't use "==" to compare strings.

Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c

8 years agoMerge "Update A11y IME switch button content description." into nyc-dev
Abodunrinwa Toki [Mon, 21 Mar 2016 18:46:48 +0000 (18:46 +0000)]
Merge "Update A11y IME switch button content description." into nyc-dev

8 years agoMark even more Bundles as defusable.
Jeff Sharkey [Mon, 21 Mar 2016 18:37:54 +0000 (12:37 -0600)]
Mark even more Bundles as defusable.

Bug: 27766193
Change-Id: Ib027ac7b40c7a575a76f289faabde9655338865e

8 years agoMerge "Correct naming issues with video calling carrier config items." into nyc-dev
Tyler Gunn [Mon, 21 Mar 2016 18:37:08 +0000 (18:37 +0000)]
Merge "Correct naming issues with video calling carrier config items." into nyc-dev

8 years agoMerge "Fix deadlock when full data backup times out" into nyc-dev
Chris Tate [Mon, 21 Mar 2016 18:31:58 +0000 (18:31 +0000)]
Merge "Fix deadlock when full data backup times out" into nyc-dev

8 years agoMerge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev
Matt Sarett [Mon, 21 Mar 2016 18:26:18 +0000 (18:26 +0000)]
Merge "Work-around paletted image decoding bug in SDK_JELLYBEAN" into nyc-dev

8 years agoMerge "API review: Hide ComplexColor and GradientColor" into nyc-dev
Tenghui Zhu [Mon, 21 Mar 2016 18:19:52 +0000 (18:19 +0000)]
Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev

8 years agoAdded support to specify animation duration when resizing stack
Wale Ogunwale [Sat, 19 Mar 2016 03:43:49 +0000 (20:43 -0700)]
Added support to specify animation duration when resizing stack

Needed for sys-ui to control the duration of various Pip transitions.

Bug: 27674339
Change-Id: I7bad27aaa19755a73c594e88b88b56db033e1a45

8 years agoAudio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO
Phil Burk [Sat, 19 Mar 2016 00:09:22 +0000 (17:09 -0700)]
Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO

Prevent developers from using a channelMask that will fail.

Bug: 27721209
Change-Id: I87ad67caedaedf6ed2230165cb1687a2a0b74703
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoMerge "Clarify docs about event recycling." into nyc-dev
Phil Weaver [Mon, 21 Mar 2016 18:11:25 +0000 (18:11 +0000)]
Merge "Clarify docs about event recycling." into nyc-dev

8 years agoAPI review: Hide ComplexColor and GradientColor
Teng-Hui Zhu [Thu, 17 Mar 2016 17:38:43 +0000 (10:38 -0700)]
API review: Hide ComplexColor and GradientColor

b/27532267

Change-Id: I01582e067ec8f4897c34dcec0f7c14700c40e02b

8 years agoMerge "Disallow guest user from changing Wifi settings" into nyc-dev
Samuel Tan [Mon, 21 Mar 2016 17:58:38 +0000 (17:58 +0000)]
Merge "Disallow guest user from changing Wifi settings" into nyc-dev

8 years agoFix deadlock when full data backup times out
Christopher Tate [Sat, 19 Mar 2016 00:59:29 +0000 (17:59 -0700)]
Fix deadlock when full data backup times out

The code was attempting to let a reported error in the app <-> engine
surface take precedence over apparent success at the engine <-> transport
handoff surface.  However, in the case of timeout, this is inappropriate.
It was leading to deadlock because the engine runs free, with socket-closed
as its shutdown signals for determinism.  In this case that means that
having accidentally asked it to finish and report the final result, we
locked up forever since the data it was writing dutifully to the engine
was no longer being consumed, and the actual teardown signals were never
sent.

The fix is to properly express the error-state hierarchy: only when the
engine <-> transport layer is not issuing its own abort is the app-data-
moving layer consulted about errors detected at that surface.

Bug 22348852

Change-Id: I8987be0c4f708116dfeb08098d7222241ed317f3

8 years agoAccount for top and bottom padding in ListPopupWindow
Alan Viverette [Mon, 21 Mar 2016 17:45:33 +0000 (13:45 -0400)]
Account for top and bottom padding in ListPopupWindow

Bug: 27550635
Change-Id: Icbd3190c35dfeb915cfb9f0b08a2f9d2b1307b24

8 years agoDon't copy Bitmaps when cloning RemoteViews
Adrian Roos [Thu, 17 Mar 2016 01:38:58 +0000 (18:38 -0700)]
Don't copy Bitmaps when cloning RemoteViews

Bug: 27385859
Fixes: 27385859

Change-Id: I9f0768b20e6e71d5366eb21df76c984bfe6989b1

8 years agoSet drawable callbacks last
Alan Viverette [Mon, 21 Mar 2016 17:35:39 +0000 (13:35 -0400)]
Set drawable callbacks last

Bug: 27554777
Change-Id: I3ef9981bfafcb2a674304c9da10e4f5b1e66f932

8 years agoMerge "Document the cache bitmap behavior for VD" into nyc-dev
Tenghui Zhu [Mon, 21 Mar 2016 17:30:42 +0000 (17:30 +0000)]
Merge "Document the cache bitmap behavior for VD" into nyc-dev

8 years agoNew Linkify.addLinks function with set of known schemes
Siyamed Sinir [Thu, 3 Mar 2016 00:02:38 +0000 (16:02 -0800)]
New Linkify.addLinks function with set of known schemes

A new addLinks function is added that accepts a default scheme and a
set of known schemes. Default scheme is applied whenever the link found
does not start with one of the given known schemes.

Moreover, previously JavaDoc for addLinks functions with a single scheme
parameter described that the scheme attribute will be prepended to the
links that do not have 'a' scheme. The code actually checks if the link
starts with the given scheme and prepends if not. JavaDoc updated
accordingly.

Bug: 26985901
Change-Id: I94ea81dcf83ba7a6b6cd47c10fe8fb277964eb15

8 years agoRil Error codes: Voice related messages
Ajay Nambi [Mon, 21 Mar 2016 17:06:21 +0000 (17:06 +0000)]
Ril Error codes: Voice related messages
am: 499a8da

* commit '499a8da1daa82f29eecd59f99721a1cdd52db716':
  Ril Error codes: Voice related messages

8 years agoClarify docs about event recycling.
Phil Weaver [Tue, 8 Mar 2016 21:05:10 +0000 (13:05 -0800)]
Clarify docs about event recycling.

Bug: 27454838
Change-Id: I65d0ced3198dc6ad45b99e4932a0d6e32306cf10

8 years agoRil Error codes: Voice related messages
Ajay Nambi [Sat, 19 Mar 2016 16:22:25 +0000 (09:22 -0700)]
Ril Error codes: Voice related messages

This change adds new error codes for messages
related to voice

Bug: 27038563
Change-Id: Id3a212c0b12e1feb26b0836fad3f9399d6dec19c