OSDN Git Service

android-x86/frameworks-base.git
7 years agoPrint A11yEv. Content Change Types in DEBUG toString
Eugene Susla [Tue, 16 May 2017 21:16:38 +0000 (14:16 -0700)]
Print A11yEv. Content Change Types in DEBUG toString

Test: Enable debug, and ensure changeTypes are properly displayed
Change-Id: I1bf6a9f56a72e867a0bc967a5e3527eb4dc83952

7 years agoMerge "Update to new SkShadowUtils interface"
Jim Van Verth [Wed, 17 May 2017 16:58:17 +0000 (16:58 +0000)]
Merge "Update to new SkShadowUtils interface"

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

Change-Id: If32172a299096dcaf180d43a10523a22e3b0903a

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 am: 63e8bfe1c5
Selim Cinek [Wed, 17 May 2017 16:18:22 +0000 (16:18 +0000)]
Merge changes I858017b8,Ife32b600 into oc-dev am: 63e8bfe1c5
am: 29260fd33b

Change-Id: Ida456542645ab7654705631dcba4d602669372e2

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 "Add tests for routeSocketDataToOutput."
TreeHugger Robot [Wed, 17 May 2017 15:55:25 +0000 (15:55 +0000)]
Merge "Add tests for routeSocketDataToOutput."

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

Change-Id: I5450d0f44c67201e9917f69ec430421d5643f765

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 "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" into oc-dev-plus-aosp
Colin Cross [Wed, 17 May 2017 15:25:11 +0000 (15:25 +0000)]
Merge "Convert libmedia_jni to Android.bp" into oc-dev-plus-aosp
am: dcf929fd42  -s ours

Change-Id: Idc3579eee2e9b97b69fe8d8244a1edd67e575bcc

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 agoAdd tests for routeSocketDataToOutput.
Artem Iglikov [Tue, 16 May 2017 13:42:33 +0000 (14:42 +0100)]
Add tests for routeSocketDataToOutput.

Also fixes the problem where it could through IndexOutOfBoundsException
instead of more natuarl EOFExcpetion in case there is not enough data in
the chunk.

Bug: 38081946
Bug: 37983441
Test: runtest -p com.android.server.backup frameworks-services
Change-Id: Icac575a76b752922b9c2d9cc0b3cad50f4273241

7 years agoMerge "Optimize App -> Recents"
TreeHugger Robot [Wed, 17 May 2017 14:00:10 +0000 (14:00 +0000)]
Merge "Optimize App -> Recents"

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

Change-Id: I0caf8f5367fe611ddacb6132ea5f0baac8ad75e6

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

Change-Id: I15db41f2e821779972ab3b430033c70aa1dfd907
Fixes: 32668632

7 years agoMerge "Add tethering offload HAL call via JNI" into oc-dev-plus-aosp
Erik Kline [Wed, 17 May 2017 05:14:06 +0000 (05:14 +0000)]
Merge "Add tethering offload HAL call via JNI" into oc-dev-plus-aosp
am: 652d17e238  -s ours

Change-Id: I7478fbe6c11a8543f96311e936b10d479442c42f

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 agoMerge "Revert "Fix recent apps in system UI for Skia pipeline"" into oc-dev am: 9363d...
John Reck [Wed, 17 May 2017 04:42:31 +0000 (04:42 +0000)]
Merge "Revert "Fix recent apps in system UI for Skia pipeline"" into oc-dev am: 9363d33262
am: 9217cb52e2  -s ours

Change-Id: I98eed8bb12569cbdf3cd7dc2aac603eb42443d8e

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 "Add tethering offload HAL call via JNI"
TreeHugger Robot [Wed, 17 May 2017 04:17:25 +0000 (04:17 +0000)]
Merge "Add tethering offload HAL call via JNI"

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

Change-Id: Iba483b8602006735e5df038634c7c5be0fc26ce4

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 "Convert libmedia_jni to Android.bp"
Colin Cross [Wed, 17 May 2017 02:42:33 +0000 (02:42 +0000)]
Merge "Convert libmedia_jni to Android.bp"

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

Change-Id: Ie3c57b34082f697bfe4e5e08f249719d9aaf2a31

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
Change-Id: I5251d05f2d2fd732a33a8955a6c346b3a2401e46

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 "Revert "Fix recent apps in system UI for Skia pipeline""
TreeHugger Robot [Wed, 17 May 2017 02:07:43 +0000 (02:07 +0000)]
Merge "Revert "Fix recent apps in system UI for Skia pipeline""

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

Change-Id: I0c662869ebda4d99a81a0c31407a47ea6699a907

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 agoMerge "Address IMSI privacy issues."
Pankaj Kanwar [Wed, 17 May 2017 01:36:55 +0000 (01:36 +0000)]
Merge "Address IMSI privacy issues."

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 "Implement program list and forced analog features of ITuner."
Tomasz Wasilczyk [Wed, 17 May 2017 01:27:08 +0000 (01:27 +0000)]
Merge "Implement program list and forced analog features of ITuner."

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

Change-Id: If1c239993ab3a6f2522321ef9e17ec4588307f10

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 agoRevert "Fix recent apps in system UI for Skia pipeline"
John Reck [Wed, 17 May 2017 00:23:44 +0000 (00:23 +0000)]
Revert "Fix recent apps in system UI for Skia pipeline"

This reverts commit b33013fb3c570e0a3ced8729dced9f0d294761a6.

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: I98b2dfd750be57a15785808e2d5723616e2ce20a

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

Change-Id: I54bac22c4c5963773d886e9f18da8f90b4aac2a6

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 "Prune repetetive code in A11yEvent toString"
TreeHugger Robot [Tue, 16 May 2017 23:30:32 +0000 (23:30 +0000)]
Merge "Prune repetetive code in A11yEvent toString"

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

Change-Id: I3d2034f8de8144ce3da90977c4f5f22533155d27

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

Change-Id: I7ef8d65d321e6ac73853dfd749ae1159d3098ded

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 "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 "Don't specify screen orientation for ReceiverActivity." into oc-dev am: 5f0460e60e
Jeff Sharkey [Tue, 16 May 2017 22:57:49 +0000 (22:57 +0000)]
Merge "Don't specify screen orientation for ReceiverActivity." into oc-dev am: 5f0460e60e
am: 36a48fa515

Change-Id: Ied9c64065f1a7b6386dec912467f3de4228f3dbc

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 "Specify behavior around DocumentsProvider#openDocument()." into oc-dev am...
Garfield Tan [Tue, 16 May 2017 22:46:24 +0000 (22:46 +0000)]
Merge "Specify behavior around DocumentsProvider#openDocument()." into oc-dev am: 146e8f415f
am: 3cd801dc24

Change-Id: I28724a4c556a9a132054eb730c09fff9b6eaed8c

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 "ViewRootImpl: Guard against null in performMeasure" into oc-dev am: 4bc839e267
Robert Carr [Tue, 16 May 2017 22:40:36 +0000 (22:40 +0000)]
Merge "ViewRootImpl: Guard against null in performMeasure" into oc-dev am: 4bc839e267
am: fc945bf674

Change-Id: Idde7f1b8382468723bbb7678e1d10f9ead3cbe1e

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 "Fixed leak of app token in exiting list." into oc-dev am: 781ad9f202
Wale Ogunwale [Tue, 16 May 2017 22:38:12 +0000 (22:38 +0000)]
Merge "Fixed leak of app token in exiting list." into oc-dev am: 781ad9f202
am: 106bf46f25

Change-Id: Iaec7c94d535cbd77ab1a01f11da03eef510d9aeb

7 years agoImplement program list and forced analog features of ITuner.
Tomasz Wasilczyk [Mon, 15 May 2017 19:55:28 +0000 (12:55 -0700)]
Implement program list and forced analog features of ITuner.

Test: instrumentation
Bug: b/36863239
Change-Id: Ib900a444f36d33dc9d55a99e699f9b6ce0c943ad

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 "Fix interaction of magnification and Final-crop." into oc-dev am: 99fbd00ac5
Robert Carr [Tue, 16 May 2017 22:29:13 +0000 (22:29 +0000)]
Merge "Fix interaction of magnification and Final-crop." into oc-dev am: 99fbd00ac5
am: 8f3258ac83

Change-Id: I564d3a101532b07ec19e648d4901e55d5fa12e84

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 "Avoid marshalling default-valued fields"
TreeHugger Robot [Tue, 16 May 2017 22:24:25 +0000 (22:24 +0000)]
Merge "Avoid marshalling default-valued fields"

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

Change-Id: I9e06dfc17f934210bcfddb44fc7be7056c9b054c

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 "SurfaceView: Reset window stopped state when attaching to window." into oc...
Robert Carr [Tue, 16 May 2017 22:13:04 +0000 (22:13 +0000)]
Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev am: 97bcf59fce
am: 14395f81a3

Change-Id: I2bc4bd531f5bd26905f5c5ab87be1e986a853b3b

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 agoAddress IMSI privacy issues.
pkanwar [Tue, 21 Feb 2017 03:23:55 +0000 (19:23 -0800)]
Address IMSI privacy issues.

Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.

Bug: 35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I62bdc8ac5e57b749fc5675c28579ec2d9183643d

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

Change-Id: Iceb651255f6541ff46f7a64092f5f55d27318d2d

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 "Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40...
Jakub Pawlowski [Tue, 16 May 2017 21:16:15 +0000 (21:16 +0000)]
Merge "Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40 am: 7e80b882b7 am: 23105d57d5" into oc-dev-plus-aosp
am: 4df112a54c

Change-Id: Ie6a2b3a54db56c607c51772592fdc2b44a108c63

7 years agoPrune repetetive code in A11yEvent toString
Eugene Susla [Tue, 16 May 2017 20:40:31 +0000 (13:40 -0700)]
Prune repetetive code in A11yEvent toString

Test: Enable debug mode and ensure event toString looks the same
Change-Id: I15b7b3e0a86bf68875c94b42599a7655e40a1fbe

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 "Always add the instant app installer" into oc-dev am: e943a3cbe7
Todd Kennedy [Tue, 16 May 2017 21:04:14 +0000 (21:04 +0000)]
Merge "Always add the instant app installer" into oc-dev am: e943a3cbe7
am: 9abb2cb590

Change-Id: I1be04d7ec849205df78d2a50e33652f59d61ee5a

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 "Fix broken retaildemo tests" into oc-dev am: cda99f106b
Christine Franks [Tue, 16 May 2017 20:56:06 +0000 (20:56 +0000)]
Merge "Fix broken retaildemo tests" into oc-dev am: cda99f106b
am: 95e1ef694c

Change-Id: I65bf196ea9add33b4b12b93427501eead636bdc4

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 agoAvoid marshalling default-valued fields
Eugene Susla [Mon, 15 May 2017 21:06:32 +0000 (14:06 -0700)]
Avoid marshalling default-valued fields

Test: 1. AccessibilityNodeInfoTest#testMarshaling
2. Hack the check from the above test to run on each parcel, then turn on
TalkBack and ensure to system crashes and stack traces in logcat
3. A11y CTS: CtsAccessibilityServiceTestCases, CtsAccessibilityTestCases,
CtsUiAutomationTestCases
Bug: 33949542

Change-Id: I2cef9fcef9d6f84334614b0e81c6717484ef3436

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