git.osdn.net Git - android-x86/frameworks-base.git/log

Daichi Hirono [Tue, 22 Mar 2016 10:52:22 +0000 (10:52 +0000)]

Merge "Revert "Open drawer when showing copy/move destination screen"" into nyc-dev
am: 5c3a152

* commit '5c3a1525b3345752d37e1604d85d545f14abda0a':
Revert "Open drawer when showing copy/move destination screen"

commit | commitdiff | tree

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

commit | commitdiff | tree

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: 27746116, 27479369
Change-Id: Ib9426c54e8c9841f3def55a88e07bf4a2cd7dcac

commit | commitdiff | tree

Tomasz Mikolajewski [Tue, 22 Mar 2016 09:47:11 +0000 (09:47 +0000)]

Merge "Notify via TalkBack about selected items." into nyc-dev
am: ace5a78

* commit 'ace5a7819486309a639fb4f4505839f46db55e3c':
Notify via TalkBack about selected items.

commit | commitdiff | tree

Tomasz Mikolajewski [Tue, 22 Mar 2016 09:40:50 +0000 (09:40 +0000)]

Merge "Notify via TalkBack about selected items." into nyc-dev

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 09:01:41 +0000 (09:01 +0000)]

Merge "Fix null pointer exception when MTP/PTP device is detached." into nyc-dev
am: f416030

* commit 'f4160302771dc688f56fac57bdab234fcbc71b04':
Fix null pointer exception when MTP/PTP device is detached.

commit | commitdiff | tree

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

commit | commitdiff | tree

Tomasz Mikolajewski [Tue, 22 Mar 2016 07:43:59 +0000 (16:43 +0900)]

Notify via TalkBack about selected items.

Bug: 27723098
Change-Id: I6927b004b3e5a592325646ae3a4663bb298a65c8

commit | commitdiff | tree

Erik Kline [Tue, 22 Mar 2016 07:30:50 +0000 (07:30 +0000)]

Merge "Support registering a request for the default network" into nyc-dev
am: d36ba73

* commit 'd36ba73ffc88cf20f5cd70e21271ce0ee35c838f':
Support registering a request for the default network

commit | commitdiff | tree

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

commit | commitdiff | tree

Jaewan Kim [Tue, 22 Mar 2016 07:25:36 +0000 (07:25 +0000)]

Merge "PIP: Increase the PIP menu\'s char limits for translation" into nyc-dev
am: c2d93dd

* commit 'c2d93dd3215fd6cacc3d07d5197eb7eb586456fa':
PIP: Increase the PIP menu's char limits for translation

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Wed, 16 Mar 2016 06:31:39 +0000 (15:31 +0900)]

Support registering a request for the default network

Change-Id: I079f5be97b585cf5692dd4c7a144b993d168a9a5

commit | commitdiff | tree

Jaesung Chung [Tue, 22 Mar 2016 05:44:30 +0000 (05:44 +0000)]

Merge "ExifInterface: fix logs" into nyc-dev
am: 285bbbb

* commit '285bbbbda45f51f53d18144b7e65edb88c888f1c':
ExifInterface: fix logs

commit | commitdiff | tree

Jaesung Chung [Tue, 22 Mar 2016 05:44:28 +0000 (05:44 +0000)]

Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev
am: f2a1076

* commit 'f2a1076cd3d8fa1e5e6b9ced4380860e720675f7':
ExifInterface: fix writing STRING and SRATIONAL formats

commit | commitdiff | tree

Lorenzo Colitti [Tue, 22 Mar 2016 05:44:26 +0000 (05:44 +0000)]

Merge "Remove framework code that calls SIOCKILLADDR" into nyc-dev
am: e6109dd

* commit 'e6109ddd3ee52f22c95e5284c325602fbdd5159f':
Remove framework code that calls SIOCKILLADDR

commit | commitdiff | tree

Jaesung Chung [Tue, 22 Mar 2016 05:39:25 +0000 (05:39 +0000)]

Merge "ExifInterface: fix logs" into nyc-dev

commit | commitdiff | tree

Jaesung Chung [Tue, 22 Mar 2016 05:38:26 +0000 (05:38 +0000)]

Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev

commit | commitdiff | tree

Lorenzo Colitti [Tue, 22 Mar 2016 05:37:07 +0000 (05:37 +0000)]

Merge "Remove framework code that calls SIOCKILLADDR" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 04:54:26 +0000 (04:54 +0000)]

Merge "Don\'t map root documents in DocumentLoader." into nyc-dev
am: e937329

* commit 'e9373290dd925b96e2269cf741684262e7af34c5':
Don't map root documents in DocumentLoader.

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 04:48:23 +0000 (04:48 +0000)]

Merge "Add root flag correctly." into nyc-dev
am: 75bb7a6

* commit '75bb7a6ef6730c52153673146a35f269aaa72039':
Add root flag correctly.

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 04:48:22 +0000 (04:48 +0000)]

Merge "Count error document to complete adding documents to the database." into nyc-dev
am: 127549b

* commit '127549b5f5747402813f00620f06fdd4ae9b4d96':
Count error document to complete adding documents to the database.

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 04:47:55 +0000 (04:47 +0000)]

Merge "Don't map root documents in DocumentLoader." into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 04:43:10 +0000 (04:43 +0000)]

Merge "Add root flag correctly." into nyc-dev

commit | commitdiff | tree

Daichi Hirono [Fri, 18 Mar 2016 06:25:00 +0000 (15:25 +0900)]

Add root flag correctly.

BUG=27369570

Change-Id: I93b9b662667009a374d879c7ab667b10fb7cbf7c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lorenzo Colitti [Tue, 22 Mar 2016 03:54:32 +0000 (12:54 +0900)]

Remove framework code that calls SIOCKILLADDR

Bug: 26976388
Change-Id: I652361d9e650a77085070d6c26b28b7638ba2dfe

commit | commitdiff | tree

Jaewan Kim [Tue, 22 Mar 2016 03:50:33 +0000 (03:50 +0000)]

Merge "PIP: Fix NPE when an activity is PIPed again immediately" into nyc-dev
am: 25fb0a5

* commit '25fb0a595958cd4f7b6845cf64f0c942ba3aaa79':
PIP: Fix NPE when an activity is PIPed again immediately

commit | commitdiff | tree

Jakub Pawlowski [Tue, 22 Mar 2016 03:50:31 +0000 (03:50 +0000)]

Update api/test-current.txt
am: 390dced

* commit '390dced18a094ee827b6772b2fa684fc6bbd4c62':
Update api/test-current.txt

commit | commitdiff | tree

Jakub Pawlowski [Tue, 22 Mar 2016 03:50:29 +0000 (03:50 +0000)]

Use handles to identify GATT attributes (4/4)
am: c9d13c3

* commit 'c9d13c3e3eab9c6568abaef55ab86fb5d2c46ad1':
Use handles to identify GATT attributes (4/4)

commit | commitdiff | tree

Jakub Pawlowski [Tue, 22 Mar 2016 03:50:28 +0000 (03:50 +0000)]

Change how services are passed up to the stack
am: bf0faed -s ours

* commit 'bf0faed3597b92d950febafcf555ad05529559d6':
Change how services are passed up to the stack

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Fri, 18 Mar 2016 22:14:16 +0000 (15:14 -0700)]

Update api/test-current.txt

Change-Id: I1fa444fbe874862e6296ee6a9751c39a0cbc4b7a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jakub Pawlowski [Tue, 22 Mar 2016 02:45:12 +0000 (02:45 +0000)]

Merge "Use handles to identify GATT attributes (4/4)" am: f8cba89
am: 9ab424a

* commit '9ab424a9fb8e72c4f1e0cbd8f67eb351e8731ef4':
Use handles to identify GATT attributes (4/4)

commit | commitdiff | tree

Jakub Pawlowski [Tue, 22 Mar 2016 02:42:29 +0000 (02:42 +0000)]

Merge "Use handles to identify GATT attributes (4/4)"
am: f8cba89

* commit 'f8cba89883b8fecb2d392444daa97703c2840874':
Use handles to identify GATT attributes (4/4)

commit | commitdiff | tree

Andre Eisenbach [Tue, 22 Mar 2016 02:35:57 +0000 (02:35 +0000)]

Merge "Use handles to identify GATT attributes (4/4)"

commit | commitdiff | tree

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

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 01:57:09 +0000 (01:57 +0000)]

Merge "Fix the logic to add suffix when copying." into nyc-dev
am: 07db6f3

* commit '07db6f3969287c2fea714d81a12b1ccd71434e99':
Fix the logic to add suffix when copying.

commit | commitdiff | tree

sergeyv [Tue, 22 Mar 2016 01:57:04 +0000 (01:57 +0000)]

Merge "Clean up and rename TypefaceImpl" into nyc-dev
am: ef8ee4c

* commit 'ef8ee4c7bb606778274bfed5b479f97583bc7fae':
Clean up and rename TypefaceImpl

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 01:57:00 +0000 (01:57 +0000)]

Merge "Add USB_HOST_CONNECTED extra to ACTION_USB_STATE sticky intent." into nyc-dev
am: fe39386

* commit 'fe39386a967976c6e9dd06af03be72c6b88544b6':
Add USB_HOST_CONNECTED extra to ACTION_USB_STATE sticky intent.

commit | commitdiff | tree

Daichi Hirono [Tue, 22 Mar 2016 01:56:55 +0000 (01:56 +0000)]

Merge "Change the title of DocumentsUI from "Files" to "Downloads"." into nyc-dev
am: c469585

* commit 'c469585cf73b6dbb01e6a71224015266c16e5e58':
Change the title of DocumentsUI from "Files" to "Downloads".

commit | commitdiff | tree

Jaewan Kim [Tue, 22 Mar 2016 01:56:49 +0000 (01:56 +0000)]

Merge "PIP: Prevent PipOverlayActivity from restarting" into nyc-dev
am: 742983e

* commit '742983e711ba3132cd09e1b277e9de53ae6596d5':
PIP: Prevent PipOverlayActivity from restarting

commit | commitdiff | tree

Jakub Pawlowski [Fri, 18 Mar 2016 22:14:16 +0000 (15:14 -0700)]

Update api/test-current.txt

Change-Id: I1fa444fbe874862e6296ee6a9751c39a0cbc4b7a

commit | commitdiff | tree

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

commit | commitdiff | tree

Sergei Vasilinetc [Tue, 22 Mar 2016 01:33:48 +0000 (01:33 +0000)]

Merge "Clean up and rename TypefaceImpl" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jaewan Kim [Tue, 22 Mar 2016 01:11:07 +0000 (01:11 +0000)]

Merge "PIP: Prevent PipOverlayActivity from restarting" into nyc-dev

commit | commitdiff | tree

Jaewan Kim [Tue, 22 Mar 2016 00:40:51 +0000 (00:40 +0000)]

Merge "Hide system UI activity with FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS in Recents" into nyc-dev
am: 61ad7ad

* commit '61ad7ad7fd8932854c498884770810d2424ee7af':
Hide system UI activity with FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS in Recents

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

sergeyv [Tue, 22 Mar 2016 00:18:37 +0000 (00:18 +0000)]

Merge "Reland: Move text logic from jni to hwui level" into nyc-dev
am: d8e91f6

* commit 'd8e91f65ae038a5223d6efd4ca4e382c7764bd4e':
Reland: Move text logic from jni to hwui level

commit | commitdiff | tree

Makoto Onuki [Tue, 22 Mar 2016 00:18:36 +0000 (00:18 +0000)]

Merge "ShortcutManager: Clean up for uninstalled packages." into nyc-dev
am: da70ee4

* commit 'da70ee48e6c3fedb3e8c824e28612ff42e01ff12':
ShortcutManager: Clean up for uninstalled packages.

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Tue, 22 Mar 2016 00:12:04 +0000 (00:12 +0000)]

Merge "ShortcutManager: Clean up for uninstalled packages." into nyc-dev

commit | commitdiff | tree

Christopher Tate [Tue, 22 Mar 2016 00:07:23 +0000 (00:07 +0000)]

Merge "Add API to read the current wallpaper\'s ID" into nyc-dev
am: c823df1

* commit 'c823df1435b6e660a2ed2f345a28b1f391378f0f':
Add API to read the current wallpaper's ID

commit | commitdiff | tree

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

commit | commitdiff | tree

sergeyv [Thu, 17 Mar 2016 18:24:22 +0000 (11:24 -0700)]

Clean up and rename TypefaceImpl

bug:25865834
Change-Id: I77e8a627163e040a5c25865054a8a936052af367

commit | commitdiff | tree

Wale Ogunwale [Mon, 21 Mar 2016 22:58:45 +0000 (22:58 +0000)]

Merge "Don\'t finish resolver activity onStop if it is for home intent" into nyc-dev
am: b2303dd

* commit 'b2303ddd0516881342067114d141bb8493997776':
Don't finish resolver activity onStop if it is for home intent

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Mon, 21 Mar 2016 22:47:52 +0000 (15:47 -0700)]

ShortcutManager: Clean up for uninstalled packages.

Bug 27548047

Change-Id: I95ca832af496fbf71023eb27a7e2647c124ffb86

commit | commitdiff | tree

Yohei Yukawa [Mon, 21 Mar 2016 22:53:19 +0000 (22:53 +0000)]

Merge "Add a comment about ResultReceiver lifetime." into nyc-dev
am: b8a95d2

* commit 'b8a95d2c9a69c39b7a74bdfea243526b7087db63':
Add a comment about ResultReceiver lifetime.

commit | commitdiff | tree

Deepanshu Gupta [Mon, 21 Mar 2016 22:53:17 +0000 (22:53 +0000)]

Merge "Add guard around getXmlFileParser() call" into nyc-dev
am: a96d258

* commit 'a96d258fdff19f5deb7bbebe98a9483987724be8':
Add guard around getXmlFileParser() call

commit | commitdiff | tree

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

commit | commitdiff | tree

Yohei Yukawa [Mon, 21 Mar 2016 22:45:19 +0000 (22:45 +0000)]

Merge "Add a comment about ResultReceiver lifetime." into nyc-dev

commit | commitdiff | tree

Deepanshu Gupta [Mon, 21 Mar 2016 22:45:11 +0000 (22:45 +0000)]

Merge "Add guard around getXmlFileParser() call" into nyc-dev

commit | commitdiff | tree

Philip P. Moltmann [Mon, 21 Mar 2016 22:34:44 +0000 (22:34 +0000)]

Merge "Don\'t mix UI and print job state" into nyc-dev
am: b9893ec

* commit 'b9893ec603a1527e7129bf5513a7f95f926ffeb9':
Don't mix UI and print job state

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Paul Stewart [Mon, 21 Mar 2016 21:55:58 +0000 (21:55 +0000)]

Merge "Fix string equality comparison" into nyc-dev
am: 0c66db8

* commit '0c66db848756ab19f218eadb72ca36b3e73c6d67':
Fix string equality comparison

commit | commitdiff | tree

Paul Stewart [Mon, 21 Mar 2016 21:50:35 +0000 (21:50 +0000)]

Merge "Fix string equality comparison" into nyc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Mar 2016 21:19:15 +0000 (21:19 +0000)]

Merge "Ignore wildcard network policies." into nyc-dev
am: c57fc47

* commit 'c57fc4787f5aadb129686e904b86d343c8ae3541':
Ignore wildcard network policies.

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Mar 2016 21:19:13 +0000 (21:19 +0000)]

Merge "Skip app widget config changes when user locked." into nyc-dev
am: 5c2183a

* commit '5c2183a8cf8661bcc1b6662ddd5ceed6cfeacdcc':
Skip app widget config changes when user locked.

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Mar 2016 21:19:10 +0000 (21:19 +0000)]

Merge "Check "Secure start-up" before toggling emulation." into nyc-dev
am: 3dc7c04

* commit '3dc7c04d80c3d547fc8615387a3c3e4fa0721d4c':
Check "Secure start-up" before toggling emulation.

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Mar 2016 21:19:07 +0000 (21:19 +0000)]

Merge "Mark even more Bundles as defusable." into nyc-dev
am: 8953147

* commit '895314740072c4ccd317f646b5e8a226ae91afbf':
Mark even more Bundles as defusable.

commit | commitdiff | tree

doheon1.lee [Mon, 21 Mar 2016 21:14:56 +0000 (21:14 +0000)]

Merge "Changes of root storage space unmounting time on Zygote Process" am: 2a87493
am: 2969a45

* commit '2969a453f020767ba87d17d2ef83252a1dd6ec6f':
Changes of root storage space unmounting time on Zygote Process

commit | commitdiff | tree

Sergei Vasilinetc [Mon, 21 Mar 2016 21:12:05 +0000 (21:12 +0000)]

Merge "Revert "Move text logic from jni to hwui level"" into nyc-dev
am: 6847953

* commit '6847953955502caa0bd0ba255d879a89aeccbd24':
Revert "Move text logic from jni to hwui level"

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Mar 2016 21:11:56 +0000 (21:11 +0000)]

Merge "Ignore wildcard network policies." into nyc-dev

commit | commitdiff | tree

doheon1.lee [Mon, 21 Mar 2016 21:11:56 +0000 (21:11 +0000)]

Merge "Changes of root storage space unmounting time on Zygote Process"
am: 2a87493

* commit '2a8749354a7d9759e91bf0885f58cfc40081d846':
Changes of root storage space unmounting time on Zygote Process

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Mar 2016 21:10:33 +0000 (21:10 +0000)]

Merge "Check "Secure start-up" before toggling emulation." into nyc-dev

commit | commitdiff | tree

Jeff Sharkey [Mon, 21 Mar 2016 21:10:13 +0000 (21:10 +0000)]

Merge "Mark even more Bundles as defusable." into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Elliott Hughes [Mon, 21 Mar 2016 21:06:09 +0000 (21:06 +0000)]

Merge "Changes of root storage space unmounting time on Zygote Process"

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Viverette [Mon, 21 Mar 2016 20:28:48 +0000 (20:28 +0000)]

Merge "Set drawable callbacks last" into nyc-dev
am: f2e6a10

* commit 'f2e6a10b3816111353a88d1588cc7edcb1e90d08':
Set drawable callbacks last

commit | commitdiff | tree

Alan Viverette [Mon, 21 Mar 2016 20:25:13 +0000 (20:25 +0000)]

Merge "Set drawable callbacks last" into nyc-dev

commit | commitdiff | tree

sergeyv [Mon, 21 Mar 2016 20:18:20 +0000 (20:18 +0000)]

Merge "Move text logic from jni to hwui level" into nyc-dev
am: 49658d4

* commit '49658d43802dc74c0ad68b7f5ba509832c1dec81':
Move text logic from jni to hwui level

commit | commitdiff | tree

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

commit | commitdiff | tree

Wale Ogunwale [Mon, 21 Mar 2016 20:11:03 +0000 (20:11 +0000)]

Merge "Added support to specify animation duration when resizing stack" into nyc-dev
am: 85941cf

* commit '85941cff0c65bc023e4ca29c0eac8548c8f61be6':
Added support to specify animation duration when resizing stack

commit | commitdiff | tree

Yang Ni [Mon, 21 Mar 2016 20:08:15 +0000 (20:08 +0000)]

Merge "Correctly init code cache path for RS" am: 60fa615
am: 85fddcf

* commit '85fddcf87e9c409aa30045d5205ce565367e3639':
Correctly init code cache path for RS