OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Optimize App -> Recents" into oc-dev
Jorim Jaggi [Wed, 17 May 2017 18:32:10 +0000 (18:32 +0000)]
Merge "Optimize App -> Recents" into oc-dev
am: 22f8290879

Change-Id: Ia3e69d2654e2dcf3e3cb60b45c12a0271d141af2

7 years agoMerge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev
Roshan Pius [Wed, 17 May 2017 18:28:51 +0000 (18:28 +0000)]
Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev
am: 26ff5a67ee

Change-Id: I73ea001fb5deab02beb2d7c1ffc1d4330e8929a8

7 years agoMerge "Fix TimePicker crash on rotation." into oc-dev
Aurimas Liutikas [Wed, 17 May 2017 18:23:34 +0000 (18:23 +0000)]
Merge "Fix TimePicker crash on rotation." into oc-dev
am: 690691336d

Change-Id: I942187e2c3f852ce992c421e8b45581833818ccb

7 years agoMerge "Optimize App -> Recents" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 18:15:37 +0000 (18:15 +0000)]
Merge "Optimize App -> Recents" into oc-dev

7 years agoMerge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev
Roshan Pius [Wed, 17 May 2017 18:14:30 +0000 (18:14 +0000)]
Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev

7 years agoMerge "Fix TimePicker crash on rotation." into oc-dev
TreeHugger Robot [Wed, 17 May 2017 18:09:47 +0000 (18:09 +0000)]
Merge "Fix TimePicker crash on rotation." into oc-dev

7 years agoMerge "Fix for Bluetooth not restarting on User Switch" am: 196b72aae5 am: 543261753a
Ram Periathiruvadi [Wed, 17 May 2017 17:51:52 +0000 (17:51 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch" am: 196b72aae5 am: 543261753a
am: 5100f55b8b

Change-Id: I7e897d209b648c583d271904cf6fdcf6c3d227c3

7 years agoMerge "Convert libmedia_jni to Android.bp" am: 85faffa7ef am: 162d19f590
Colin Cross [Wed, 17 May 2017 17:43:19 +0000 (17:43 +0000)]
Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef am: 162d19f590
am: 7eb3f1c1c4  -s ours

Change-Id: If30e083b58365ad922732fc86beaf2f03209cf88

7 years agoMerge "Fix for Bluetooth not restarting on User Switch" am: 196b72aae5
Ram Periathiruvadi [Wed, 17 May 2017 17:41:05 +0000 (17:41 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch" am: 196b72aae5
am: 543261753a

Change-Id: I008ff84f3d3eb0b7c51993d213a9d3a590cd93a6

7 years agoMerge "Add tethering offload HAL call via JNI" am: 8f65e470b0 am: f421d60824
Erik Kline [Wed, 17 May 2017 17:37:25 +0000 (17:37 +0000)]
Merge "Add tethering offload HAL call via JNI" am: 8f65e470b0 am: f421d60824
am: c967d56ad7  -s ours

Change-Id: Ic1c1ab0a51459e390e8607217be8f0c6ef0c2bde

7 years agoMerge "Merge "Add the new RIL requests and NetworkScanResult." am: 0727abc423 am...
Android Build Merger (Role) [Wed, 17 May 2017 17:34:30 +0000 (17:34 +0000)]
Merge "Merge "Add the new RIL requests and NetworkScanResult." am: 0727abc423 am: a37b511b67 am: 7ae9c06663" into oc-dev-plus-aosp

7 years agoMerge "Fix for Bluetooth not restarting on User Switch"
Ram Periathiruvadi [Wed, 17 May 2017 17:33:28 +0000 (17:33 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch"
am: 196b72aae5

Change-Id: Id0ef82b93b047f13683f7538740f0544549b0eca

7 years agoMerge "Add the new RIL requests and NetworkScanResult." am: 0727abc423 am: a37b511b67
Ying Xu [Wed, 17 May 2017 17:32:33 +0000 (17:32 +0000)]
Merge "Add the new RIL requests and NetworkScanResult." am: 0727abc423 am: a37b511b67
am: 7ae9c06663

Change-Id: I83e6c2b31964625e0beb594d8e440ff5a56359f3

7 years agoMerge "Add the new RIL requests and NetworkScanResult." into oc-dev-plus-aosp
Ying Xu [Wed, 17 May 2017 17:30:28 +0000 (17:30 +0000)]
Merge "Add the new RIL requests and NetworkScanResult." into oc-dev-plus-aosp

7 years agoMerge "Fix for Bluetooth not restarting on User Switch"
Treehugger Robot [Wed, 17 May 2017 17:24:02 +0000 (17:24 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch"

7 years agoMerge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev
George Mount [Wed, 17 May 2017 16:26:40 +0000 (16:26 +0000)]
Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev
am: 7415a5941b

Change-Id: I14c0522ab05ba5cea0d1800dd45451c8951acd26

7 years agoMerge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 16:18:57 +0000 (16:18 +0000)]
Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev

7 years agoMerge changes I858017b8,Ife32b600 into oc-dev
Selim Cinek [Wed, 17 May 2017 16:09:50 +0000 (16:09 +0000)]
Merge changes I858017b8,Ife32b600 into oc-dev
am: 63e8bfe1c5

Change-Id: Ib280d1e343d5765ea93edcfbc5aae21417e6c590

7 years agoMerge changes I858017b8,Ife32b600 into oc-dev
Selim Cinek [Wed, 17 May 2017 15:59:03 +0000 (15:59 +0000)]
Merge changes I858017b8,Ife32b600 into oc-dev

* changes:
  Improved the media color extraction algorithm
  Fixed broken coretests

7 years agoMerge "PackageManager: Change post-install GC request" into oc-dev
Andreas Gampe [Wed, 17 May 2017 15:38:19 +0000 (15:38 +0000)]
Merge "PackageManager: Change post-install GC request" into oc-dev
am: 89b5189516

Change-Id: Iba648c487eeb3fc5a699a641e3bfef9776143466

7 years agoMerge "Convert libmedia_jni to Android.bp" am: 85faffa7ef
Colin Cross [Wed, 17 May 2017 15:36:06 +0000 (15:36 +0000)]
Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef
am: 162d19f590

Change-Id: Iac2f159014051604d36f61dd253fa4e83127030a

7 years agoMerge "PackageManager: Change post-install GC request" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 15:32:03 +0000 (15:32 +0000)]
Merge "PackageManager: Change post-install GC request" into oc-dev

7 years agoMerge "Convert libmedia_jni to Android.bp"
Colin Cross [Wed, 17 May 2017 15:29:29 +0000 (15:29 +0000)]
Merge "Convert libmedia_jni to Android.bp"
am: 85faffa7ef

Change-Id: I7afbf6dda3dab6a3c36576e2c118b1accdcc2a17

7 years agoMerge "Convert libmedia_jni to Android.bp"
Colin Cross [Wed, 17 May 2017 15:19:25 +0000 (15:19 +0000)]
Merge "Convert libmedia_jni to Android.bp"

7 years agoMerge "Convert libmedia_jni to Android.bp" into oc-dev-plus-aosp
Colin Cross [Wed, 17 May 2017 15:17:14 +0000 (15:17 +0000)]
Merge "Convert libmedia_jni to Android.bp" into oc-dev-plus-aosp

7 years agoFix TimePicker crash on rotation.
Aurimas Liutikas [Wed, 17 May 2017 15:17:09 +0000 (08:17 -0700)]
Fix TimePicker crash on rotation.

We were using two different types of layouts in landscape and portrait.

I unintentionally changed it from RelativeLayout to LinearLayout originally,
without even removing relative layout params.

Bug: 37650833
Test: Manual check that TimePicker no longer crashes on device rotation
Change-Id: If951e83c32377c0ed52d553ceb80683c4fba8b85

7 years agoMerge "Fingerprint: call onRemovalSucceeded with # of remaining templates." into...
Charles He [Wed, 17 May 2017 13:15:42 +0000 (13:15 +0000)]
Merge "Fingerprint: call onRemovalSucceeded with # of remaining templates." into oc-dev
am: 50be382341

Change-Id: I5c6f8dfed5777de8098fa6a02d5a3124addedf22

7 years agoMerge "Fingerprint: call onRemovalSucceeded with # of remaining templates." into...
Charles He [Wed, 17 May 2017 12:58:15 +0000 (12:58 +0000)]
Merge "Fingerprint: call onRemovalSucceeded with # of remaining templates." into oc-dev

7 years agoOptimize App -> Recents
Jorim Jaggi [Sat, 13 May 2017 21:16:44 +0000 (23:16 +0200)]
Optimize App -> Recents

- Use same strategy to draw thumbnail bitmap by moving
startActivity off from the main thread and start caching the future
when AM is busy executing startActivity.
- Move some binder calls off the main thread.
- Add some trace points for better analysis in the future.
- Make toggleRecentApps asynchronous so we don't have to wait on
the next app-vsync - it's totally not needed.

Test: com.android.apptransition.tests.LatencyTests

Fixes: 32668632
Change-Id: Id6483e26e9d6c1e319bceaa8268da976cedfbca3
Merged-In: I15db41f2e821779972ab3b430033c70aa1dfd907

7 years agoMerge "Add tethering offload HAL call via JNI" am: 8f65e470b0
Erik Kline [Wed, 17 May 2017 07:26:25 +0000 (07:26 +0000)]
Merge "Add tethering offload HAL call via JNI" am: 8f65e470b0
am: f421d60824

Change-Id: I49a81e240cfd5d6ad58bb3af50fbcb9a410eb0d8

7 years agoMerge "Add tethering offload HAL call via JNI"
Erik Kline [Wed, 17 May 2017 07:18:51 +0000 (07:18 +0000)]
Merge "Add tethering offload HAL call via JNI"
am: 8f65e470b0

Change-Id: Ib8403f685371b44f0fdad6d15ae372787d457d13

7 years agoMerge "Add tethering offload HAL call via JNI"
Treehugger Robot [Wed, 17 May 2017 07:09:13 +0000 (07:09 +0000)]
Merge "Add tethering offload HAL call via JNI"

7 years agoAdd the new RIL requests and NetworkScanResult.
yinxu [Thu, 20 Apr 2017 22:33:57 +0000 (15:33 -0700)]
Add the new RIL requests and NetworkScanResult.

Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Merged-in: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb40222e1c0a61b13c1eca601ba761bd26e)
(cherry picked from commit 84c9e01f10bd5987bd9a401db9e0d46400f88540)

7 years agoMerge "Add tethering offload HAL call via JNI" into oc-dev-plus-aosp
TreeHugger Robot [Wed, 17 May 2017 05:07:34 +0000 (05:07 +0000)]
Merge "Add tethering offload HAL call via JNI" into oc-dev-plus-aosp

7 years agoConvert libmedia_jni to Android.bp
Colin Cross [Tue, 16 May 2017 01:10:40 +0000 (18:10 -0700)]
Convert libmedia_jni to Android.bp

See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
Merged-In: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
(cherry picked from commit 76de4f6b4d09423b3a5d3603527ce79acae4ed32)

7 years agoAdd tethering offload HAL call via JNI
Erik Kline [Sun, 30 Apr 2017 10:36:15 +0000 (19:36 +0900)]
Add tethering offload HAL call via JNI

Additionally, try to locate java Control interface.

Test: as follows
    - built
    - flashed
    - booted
    - OffloadController log messages observed, but only ever
      "not enabled" messages (needs a supporting implementation)
Bug: 29337859
Bug: 32163131
Bug: 34361337
Merged-In: I5251d05f2d2fd732a33a8955a6c346b3a2401e46
Change-Id: I5251d05f2d2fd732a33a8955a6c346b3a2401e46
(cherry picked from commit 58ed1b051bdffd239d92919170a0bb41a4cc197c)

7 years agoAdd tethering offload HAL call via JNI
Erik Kline [Sun, 30 Apr 2017 10:36:15 +0000 (19:36 +0900)]
Add tethering offload HAL call via JNI

Additionally, try to locate java Control interface.

Test: as follows
    - built
    - flashed
    - booted
    - OffloadController log messages observed, but only ever
      "not enabled" messages (needs a supporting implementation)
Bug: 29337859
Bug: 32163131
Bug: 34361337
Merged-In: I5251d05f2d2fd732a33a8955a6c346b3a2401e46
Change-Id: I5251d05f2d2fd732a33a8955a6c346b3a2401e46
(cherry picked from commit 58ed1b051bdffd239d92919170a0bb41a4cc197c)

7 years agoMerge "Revert "Fix recent apps in system UI for Skia pipeline"" into oc-dev
John Reck [Wed, 17 May 2017 04:36:23 +0000 (04:36 +0000)]
Merge "Revert "Fix recent apps in system UI for Skia pipeline"" into oc-dev
am: 9363d33262

Change-Id: I4c67e3eea36a118beb81f4bf2029776102200cf4

7 years agoMerge "Revert "Fix recent apps in system UI for Skia pipeline"" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 04:29:00 +0000 (04:29 +0000)]
Merge "Revert "Fix recent apps in system UI for Skia pipeline"" into oc-dev

7 years agoMerge "Set notification channel to MTP notification." into oc-dev
Daichi Hirono [Wed, 17 May 2017 03:21:27 +0000 (03:21 +0000)]
Merge "Set notification channel to MTP notification." into oc-dev
am: 8b81a0a1fc

Change-Id: Ie9a78104b80f034f459ad7a0225bf4d99c0cf33d

7 years agoMerge "Set notification channel to MTP notification." into oc-dev
TreeHugger Robot [Wed, 17 May 2017 03:13:23 +0000 (03:13 +0000)]
Merge "Set notification channel to MTP notification." into oc-dev

7 years agoConvert libmedia_jni to Android.bp
Colin Cross [Tue, 16 May 2017 01:10:40 +0000 (18:10 -0700)]
Convert libmedia_jni to Android.bp

See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
Merged-In: I1817c75ee45537ca0d5fc40a035f94a3dfeccc11
(cherry picked from commit 76de4f6b4d09423b3a5d3603527ce79acae4ed32)

7 years agoMerge "Add more JSDoc about ErrnoException" into oc-dev
Daichi Hirono [Wed, 17 May 2017 02:26:08 +0000 (02:26 +0000)]
Merge "Add more JSDoc about ErrnoException" into oc-dev
am: 487231e79c

Change-Id: I7c4194bdc5d7f2f61c7fead09765b24d432a93a2

7 years agoMerge "Add more JSDoc about ErrnoException" into oc-dev
TreeHugger Robot [Wed, 17 May 2017 02:16:56 +0000 (02:16 +0000)]
Merge "Add more JSDoc about ErrnoException" into oc-dev

7 years agoMerge "AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION" into oc-dev
Andy Hung [Wed, 17 May 2017 01:39:55 +0000 (01:39 +0000)]
Merge "AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION" into oc-dev
am: 52f57cb720

Change-Id: Idb0f8a1565c4eb36ad0031a86b244f698e9cefbd

7 years agoSet notification channel to MTP notification.
Daichi Hirono [Fri, 12 May 2017 08:56:08 +0000 (17:56 +0900)]
Set notification channel to MTP notification.

Bug: 38252594
Test: Manually connect MTP device to Android
Change-Id: Ib7ab12b2401d36dbb4cca2fd9c18cbd3505ed9ef

7 years agoMerge "AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION" into oc-dev
Andy Hung [Wed, 17 May 2017 01:34:11 +0000 (01:34 +0000)]
Merge "AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION" into oc-dev

7 years agoMerge "Fix issue #38244875: Bring back testChargingConstraintFails" into oc-dev
Dianne Hackborn [Wed, 17 May 2017 01:00:36 +0000 (01:00 +0000)]
Merge "Fix issue #38244875: Bring back testChargingConstraintFails" into oc-dev
am: 0cd3e8f694

Change-Id: I5280a18f0f93396e02df236fb3f78fa952cbc460

7 years agoMerge "Fix issue #38244875: Bring back testChargingConstraintFails" into oc-dev
Dianne Hackborn [Wed, 17 May 2017 00:50:43 +0000 (00:50 +0000)]
Merge "Fix issue #38244875: Bring back testChargingConstraintFails" into oc-dev

7 years agoRevert "Fix recent apps in system UI for Skia pipeline"
John Reck [Tue, 16 May 2017 22:02:36 +0000 (22:02 +0000)]
Revert "Fix recent apps in system UI for Skia pipeline"

This reverts commit 625dd56a45bfe95c5f1baa1891529503ff3374a9.

Reason for revert: Caused a memory leak, b/38330767
Bug: 38136140
Bug: 38330767
Test: manual, verified memory isn't leaking doing the steps in b/38330767

Change-Id: I998bea04788d58ba6bad71c1691d5a3b33190c1b
Merged-In: I98b2dfd750be57a15785808e2d5723616e2ce20a

7 years agoMerge "Updating Overview to work with PiP" into oc-dev
Winson Chung [Tue, 16 May 2017 23:50:04 +0000 (23:50 +0000)]
Merge "Updating Overview to work with PiP" into oc-dev
am: 0553cbcf36

Change-Id: I57d2f76567c0a92d9a282c6c8cdd0732be06873d

7 years agoMerge "Updating Overview to work with PiP" into oc-dev
Winson Chung [Tue, 16 May 2017 23:41:09 +0000 (23:41 +0000)]
Merge "Updating Overview to work with PiP" into oc-dev

7 years agoMerge "Add the new RIL requests and NetworkScanResult." am: 0727abc423
Ying Xu [Tue, 16 May 2017 23:21:40 +0000 (23:21 +0000)]
Merge "Add the new RIL requests and NetworkScanResult." am: 0727abc423
am: a37b511b67

Change-Id: If49a2d8139863f0322d73a90bd1d70cc1965bece

7 years agoMerge "Add the new RIL requests and NetworkScanResult."
Ying Xu [Tue, 16 May 2017 23:11:24 +0000 (23:11 +0000)]
Merge "Add the new RIL requests and NetworkScanResult."
am: 0727abc423

Change-Id: I41560f522b3c46de4fe1a7a8377a6f2b7af04534

7 years agoMerge "Discover primary service by UUID for PTS tests (4/4)" into oc-dev
Jakub Pawlowski [Tue, 16 May 2017 23:08:05 +0000 (23:08 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)" into oc-dev
am: 9e6ef496bc

Change-Id: I689e8290c1d6572dc3fcb43e9fd320145fc08d0e

7 years agoMerge "Add the new RIL requests and NetworkScanResult."
Ying Xu [Tue, 16 May 2017 23:04:39 +0000 (23:04 +0000)]
Merge "Add the new RIL requests and NetworkScanResult."

7 years agoMerge "Use ArrayList as children" into oc-dev
Jorim Jaggi [Tue, 16 May 2017 23:01:22 +0000 (23:01 +0000)]
Merge "Use ArrayList as children" into oc-dev
am: c7a31d1970

Change-Id: I094414b00ff540cd7e388db4b1581f0c3c09d49f

7 years agoMerge "Discover primary service by UUID for PTS tests (4/4)" into oc-dev
TreeHugger Robot [Tue, 16 May 2017 22:53:42 +0000 (22:53 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)" into oc-dev

7 years agoMerge "Use ArrayList as children" into oc-dev
Jorim Jaggi [Tue, 16 May 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Use ArrayList as children" into oc-dev

7 years agoMerge "Don't specify screen orientation for ReceiverActivity." into oc-dev
Jeff Sharkey [Tue, 16 May 2017 22:49:09 +0000 (22:49 +0000)]
Merge "Don't specify screen orientation for ReceiverActivity." into oc-dev
am: 5f0460e60e

Change-Id: Id495da4b032d19a34fb4538b69836434cde49215

7 years agoMerge "Don't specify screen orientation for ReceiverActivity." into oc-dev
Jeff Sharkey [Tue, 16 May 2017 22:42:03 +0000 (22:42 +0000)]
Merge "Don't specify screen orientation for ReceiverActivity." into oc-dev

7 years agoMerge "Specify behavior around DocumentsProvider#openDocument()." into oc-dev
Garfield Tan [Tue, 16 May 2017 22:39:04 +0000 (22:39 +0000)]
Merge "Specify behavior around DocumentsProvider#openDocument()." into oc-dev
am: 146e8f415f

Change-Id: I014761972a0803a1865dd6c18a95cfeacec7beb4

7 years agoMerge "Specify behavior around DocumentsProvider#openDocument()." into oc-dev
TreeHugger Robot [Tue, 16 May 2017 22:34:35 +0000 (22:34 +0000)]
Merge "Specify behavior around DocumentsProvider#openDocument()." into oc-dev

7 years agoMerge "ViewRootImpl: Guard against null in performMeasure" into oc-dev
Robert Carr [Tue, 16 May 2017 22:30:15 +0000 (22:30 +0000)]
Merge "ViewRootImpl: Guard against null in performMeasure" into oc-dev
am: 4bc839e267

Change-Id: I1bc8741550626747849a13b15e8ec45dbc5d8110

7 years agoMerge "Fixed leak of app token in exiting list." into oc-dev
Wale Ogunwale [Tue, 16 May 2017 22:25:29 +0000 (22:25 +0000)]
Merge "Fixed leak of app token in exiting list." into oc-dev
am: 781ad9f202

Change-Id: I0ce62bb39852d2107a84f6d3bc290b7dd4115456

7 years agoMerge "ViewRootImpl: Guard against null in performMeasure" into oc-dev
TreeHugger Robot [Tue, 16 May 2017 22:25:04 +0000 (22:25 +0000)]
Merge "ViewRootImpl: Guard against null in performMeasure" into oc-dev

7 years agoMerge "Fix interaction of magnification and Final-crop." into oc-dev
Robert Carr [Tue, 16 May 2017 22:18:24 +0000 (22:18 +0000)]
Merge "Fix interaction of magnification and Final-crop." into oc-dev
am: 99fbd00ac5

Change-Id: I9e366ea4c463cd5591e6b92f4539c04f10f70ff8

7 years agoMerge "Fixed leak of app token in exiting list." into oc-dev
TreeHugger Robot [Tue, 16 May 2017 22:14:17 +0000 (22:14 +0000)]
Merge "Fixed leak of app token in exiting list." into oc-dev

7 years agoMerge "Restrict access to instant app data in usage stats" into oc-dev
Makoto Onuki [Tue, 16 May 2017 22:11:46 +0000 (22:11 +0000)]
Merge "Restrict access to instant app data in usage stats" into oc-dev
am: f38a1d3d2a

Change-Id: I923a3d6792bddc782382edf1180704167e8918b1

7 years agoMerge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev
Robert Carr [Tue, 16 May 2017 22:03:11 +0000 (22:03 +0000)]
Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev
am: 97bcf59fce

Change-Id: If55aff3522f664ad5edf7c282a211b5b65958c73

7 years agoMerge "Fix interaction of magnification and Final-crop." into oc-dev
TreeHugger Robot [Tue, 16 May 2017 21:59:49 +0000 (21:59 +0000)]
Merge "Fix interaction of magnification and Final-crop." into oc-dev

7 years agoMerge "Restrict access to instant app data in usage stats" into oc-dev
TreeHugger Robot [Tue, 16 May 2017 21:56:09 +0000 (21:56 +0000)]
Merge "Restrict access to instant app data in usage stats" into oc-dev

7 years agoMerge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev
TreeHugger Robot [Tue, 16 May 2017 21:51:24 +0000 (21:51 +0000)]
Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev

7 years agoMerge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3 am: c942ae61e9
Andreas Gampe [Tue, 16 May 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3 am: c942ae61e9
am: 85c5e1c123

Change-Id: Id599b6c108b656932343209eb29abb3837b15624

7 years agoMerge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3
Andreas Gampe [Tue, 16 May 2017 21:09:51 +0000 (21:09 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names" am: 11780f1ad3
am: c942ae61e9

Change-Id: I06a030f61b15aae3bb971c5f5666c940592f48e0

7 years agoMerge "Zygote: Allow arbitrary-length wrap property names"
Andreas Gampe [Tue, 16 May 2017 21:03:04 +0000 (21:03 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names"
am: 11780f1ad3

Change-Id: Id1454ecd597347d5fca5f06a17df26e7303c59db

7 years agoMerge "Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40...
Android Build Merger (Role) [Tue, 16 May 2017 20:57:36 +0000 (20:57 +0000)]
Merge "Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40 am: 7e80b882b7 am: 23105d57d5" into oc-dev-plus-aosp

7 years agoMerge "Always add the instant app installer" into oc-dev
Todd Kennedy [Tue, 16 May 2017 20:55:38 +0000 (20:55 +0000)]
Merge "Always add the instant app installer" into oc-dev
am: e943a3cbe7

Change-Id: I2f057e4d0367fd47050c30340490987ef6d2128a

7 years agoMerge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40 am: 7e80b...
Jakub Pawlowski [Tue, 16 May 2017 20:55:37 +0000 (20:55 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40 am: 7e80b882b7
am: 23105d57d5

Change-Id: I764d8b206940a39906c6793fef24e6d5b19a8589

7 years agoDiscover primary service by UUID for PTS tests (4/4)
Jakub Pawlowski [Tue, 16 May 2017 17:56:35 +0000 (10:56 -0700)]
Discover primary service by UUID for PTS tests (4/4)

Bug: 38123054
Test: manual
Change-Id: I89e088e60f4325f1ece59d22efda0c907a3b716a
(cherry picked from commit fe2bf16a2b287c3c748cd6fa7c14026becfe83ff)

7 years agoMerge "Zygote: Allow arbitrary-length wrap property names"
Treehugger Robot [Tue, 16 May 2017 20:49:54 +0000 (20:49 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names"

7 years agoMerge "Fix broken retaildemo tests" into oc-dev
Christine Franks [Tue, 16 May 2017 20:43:48 +0000 (20:43 +0000)]
Merge "Fix broken retaildemo tests" into oc-dev
am: cda99f106b

Change-Id: Ieec0cc5c41d9416da9f84e1d2a91ffe96e64afc5

7 years agoMerge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40
Jakub Pawlowski [Tue, 16 May 2017 20:40:58 +0000 (20:40 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40
am: 7e80b882b7

Change-Id: I048c7b1ca915744da1e06e0280be125e7da2b796

7 years agoMerge "Always add the instant app installer" into oc-dev
TreeHugger Robot [Tue, 16 May 2017 20:39:39 +0000 (20:39 +0000)]
Merge "Always add the instant app installer" into oc-dev

7 years agoAdd the new RIL requests and NetworkScanResult.
yinxu [Thu, 20 Apr 2017 22:33:57 +0000 (15:33 -0700)]
Add the new RIL requests and NetworkScanResult.

Those new RIL requests will be used to start and stop network scan, and
the scan result will be returned from RIL in the format of
NetworkScanResult.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I2bfd0fb8cbb3815cc62ec4385594dec9c5e4d279
(cherry picked from commit b36a4cb40222e1c0a61b13c1eca601ba761bd26e)

7 years agoMerge "Fix broken retaildemo tests" into oc-dev
Christine Franks [Tue, 16 May 2017 20:34:35 +0000 (20:34 +0000)]
Merge "Fix broken retaildemo tests" into oc-dev

7 years agoFix broken LoaderLifecycleTest#loaderIdentityTest
George Mount [Tue, 16 May 2017 20:07:51 +0000 (13:07 -0700)]
Fix broken LoaderLifecycleTest#loaderIdentityTest

Bug 37994415

We have a preemptive check for getLoaderManager() to ensure that
the host is set before returning a value. In this test, the host
was not set because the fragment was restored and on the back stack.

The solution is to pop the back stack to ensure that it is added
so that it comes up to the proper state before getting the loader
manager.

Test: ran the broken test
Change-Id: Ic91cc5ca9468da22bdfef28cda1d4488b2f737f0

7 years agoMerge "Discover primary service by UUID for PTS tests (4/4)"
Jakub Pawlowski [Tue, 16 May 2017 20:29:08 +0000 (20:29 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)"
am: abb732fc40

Change-Id: I09534a5b9b961f1ac1ecf93172e1ae5c33cf5df1

7 years agoMerge "Discover primary service by UUID for PTS tests (4/4)"
Treehugger Robot [Tue, 16 May 2017 20:20:16 +0000 (20:20 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)"

7 years agoFix issue #38244875: Bring back testChargingConstraintFails
Dianne Hackborn [Tue, 16 May 2017 20:14:37 +0000 (13:14 -0700)]
Fix issue #38244875: Bring back testChargingConstraintFails

- Add new "get-job-state" shell command that the tests can use
  to find out what is going on with a job.
- Fix an issue in the battery controller where it would not
  immediately stop with a "battery not low" constraint when
  the battery becomes low.
- Also an optimization to rescheduling jobs, for every scheduled
  job that is not ready don't look to see if it is active.
  Instead, go through the active jobs and see if any are no
  longer ready.

Test: bit -t CtsJobSchedulerTestCases:*

Change-Id: I5611886653258ca337eee97c5ee1b9b3dfdb6d85

7 years agoSpecify behavior around DocumentsProvider#openDocument().
Garfield Tan [Mon, 15 May 2017 21:19:11 +0000 (14:19 -0700)]
Specify behavior around DocumentsProvider#openDocument().

Add supported modes and contracts on receiving unsupported modes.
Test: Builds.
Bug: 11279339

Change-Id: I8c403f6168baadb354813d4c1e630bb8662ddb34

7 years agoMerge "startStreaming for MBMS apis" am: 4b3c44be55 am: 0a4740ec5c
Hall Liu [Tue, 16 May 2017 20:05:41 +0000 (20:05 +0000)]
Merge "startStreaming for MBMS apis" am: 4b3c44be55 am: 0a4740ec5c
am: 624290d3c8

Change-Id: I6cddee57736b27dfcf88537f4e602d4bf6bc81aa

7 years agoFixed leak of app token in exiting list.
Wale Ogunwale [Tue, 16 May 2017 15:56:37 +0000 (08:56 -0700)]
Fixed leak of app token in exiting list.

- Remove app token from exiting list when it's last window is removed.
- Remove app token from exiting list when it's removal isn't delayed.

Test: Launch a few apps and press back and make sure the exit app to
list dump is empty.
Fixes: 38337456

Change-Id: Ia2f22c6f1add5f867e25583ec38ffccc71217ee7

7 years agoMerge "Support different SIM power states" am: 0517b719bc am: 1bbe5b21f3
Grace Chen [Tue, 16 May 2017 19:58:37 +0000 (19:58 +0000)]
Merge "Support different SIM power states" am: 0517b719bc am: 1bbe5b21f3
am: c742ab7a44

Change-Id: I71d696c6c725e65357f0704047d534cfc69973d6

7 years agoMerge "startStreaming for MBMS apis" am: 4b3c44be55
Hall Liu [Tue, 16 May 2017 19:58:20 +0000 (19:58 +0000)]
Merge "startStreaming for MBMS apis" am: 4b3c44be55
am: 0a4740ec5c

Change-Id: I9548b8211501358fc59570ba88f1bc1fa9731b1f

7 years agoMerge "startStreaming for MBMS apis"
Hall Liu [Tue, 16 May 2017 19:52:26 +0000 (19:52 +0000)]
Merge "startStreaming for MBMS apis"
am: 4b3c44be55

Change-Id: Id0e2e95387300147ba32ec3a418605901fdb241b

7 years agoMerge "Support different SIM power states" am: 0517b719bc
Grace Chen [Tue, 16 May 2017 19:50:40 +0000 (19:50 +0000)]
Merge "Support different SIM power states" am: 0517b719bc
am: 1bbe5b21f3

Change-Id: I04e071b461a6ccecc46f9fbdc2f4ce6aeb311cb2

7 years agoMerge "Check for mAttachInfo nullness when getting the autofillable drawable." into...
Felipe Leme [Tue, 16 May 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Check for mAttachInfo nullness when getting the autofillable drawable." into oc-dev
am: 83478acb87

Change-Id: I927894efbe0dbe506b18d42cd1840596299a0270

7 years agoMerge "Optimize hot launching recents" into oc-dev
Jorim Jaggi [Tue, 16 May 2017 19:46:54 +0000 (19:46 +0000)]
Merge "Optimize hot launching recents" into oc-dev
am: cb414be017

Change-Id: I8b9004a482b70b86b53d43cf7f4dd5fc0bd1d842

7 years agoUse ArrayList as children
Jorim Jaggi [Tue, 16 May 2017 15:11:18 +0000 (17:11 +0200)]
Use ArrayList as children

Such that traversal is O(n) instead of O(n²)

Test: WindowContainerTests
Bug: 32668632
Change-Id: Ie52026a76a0f65c71ff6bd35d13b3d0c5d44bb3f