OSDN Git Service
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
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
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
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
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
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
TreeHugger Robot [Wed, 17 May 2017 16:18:57 +0000 (16:18 +0000)]
Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" 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
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
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
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
TreeHugger Robot [Wed, 17 May 2017 15:32:03 +0000 (15:32 +0000)]
Merge "PackageManager: Change post-install GC request" into oc-dev
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
Colin Cross [Wed, 17 May 2017 15:19:25 +0000 (15:19 +0000)]
Merge "Convert libmedia_jni to Android.bp"
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
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
Charles He [Wed, 17 May 2017 12:58:15 +0000 (12:58 +0000)]
Merge "Fingerprint: call onRemovalSucceeded with # of remaining templates." into oc-dev
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
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
Treehugger Robot [Wed, 17 May 2017 07:09:13 +0000 (07:09 +0000)]
Merge "Add tethering offload HAL call via JNI"
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)
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
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)
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)
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)
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
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
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
TreeHugger Robot [Wed, 17 May 2017 03:13:23 +0000 (03:13 +0000)]
Merge "Set notification channel to MTP notification." into oc-dev
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)
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
TreeHugger Robot [Wed, 17 May 2017 02:16:56 +0000 (02:16 +0000)]
Merge "Add more JSDoc about ErrnoException" 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
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
Andy Hung [Wed, 17 May 2017 01:34:11 +0000 (01:34 +0000)]
Merge "AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION" 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
Dianne Hackborn [Wed, 17 May 2017 00:50:43 +0000 (00:50 +0000)]
Merge "Fix issue #
38244875: Bring back testChargingConstraintFails" into oc-dev
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
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
Winson Chung [Tue, 16 May 2017 23:41:09 +0000 (23:41 +0000)]
Merge "Updating Overview to work with PiP" into oc-dev
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
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
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
Ying Xu [Tue, 16 May 2017 23:04:39 +0000 (23:04 +0000)]
Merge "Add the new RIL requests and NetworkScanResult."
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
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
Jorim Jaggi [Tue, 16 May 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Use ArrayList as children" 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
Jeff Sharkey [Tue, 16 May 2017 22:42:03 +0000 (22:42 +0000)]
Merge "Don't specify screen orientation for ReceiverActivity." 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
TreeHugger Robot [Tue, 16 May 2017 22:34:35 +0000 (22:34 +0000)]
Merge "Specify behavior around DocumentsProvider#openDocument()." 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
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
TreeHugger Robot [Tue, 16 May 2017 22:25:04 +0000 (22:25 +0000)]
Merge "ViewRootImpl: Guard against null in performMeasure" 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
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
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
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
TreeHugger Robot [Tue, 16 May 2017 21:59:49 +0000 (21:59 +0000)]
Merge "Fix interaction of magnification and Final-crop." 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
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
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
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
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
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
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
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
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)
Treehugger Robot [Tue, 16 May 2017 20:49:54 +0000 (20:49 +0000)]
Merge "Zygote: Allow arbitrary-length wrap property names"
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
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
TreeHugger Robot [Tue, 16 May 2017 20:39:39 +0000 (20:39 +0000)]
Merge "Always add the instant app installer" into oc-dev
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)
Christine Franks [Tue, 16 May 2017 20:34:35 +0000 (20:34 +0000)]
Merge "Fix broken retaildemo tests" into oc-dev
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
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
Treehugger Robot [Tue, 16 May 2017 20:20:16 +0000 (20:20 +0000)]
Merge "Discover primary service by UUID for PTS tests (4/4)"
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
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
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
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
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
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
Hall Liu [Tue, 16 May 2017 19:52:26 +0000 (19:52 +0000)]
Merge "startStreaming for MBMS apis"
am:
4b3c44be55
Change-Id: Id0e2e95387300147ba32ec3a418605901fdb241b
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
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
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
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
Hall Liu [Tue, 16 May 2017 19:45:10 +0000 (19:45 +0000)]
Merge "startStreaming for MBMS apis"
Grace Chen [Tue, 16 May 2017 19:42:42 +0000 (19:42 +0000)]
Merge "Support different SIM power states"
am:
0517b719bc
Change-Id: Icb6db4d805b4aea701a803eaaec716954f2ebf2a
TreeHugger Robot [Tue, 16 May 2017 19:38:32 +0000 (19:38 +0000)]
Merge "Check for mAttachInfo nullness when getting the autofillable drawable." into oc-dev
Jorim Jaggi [Tue, 16 May 2017 19:34:45 +0000 (19:34 +0000)]
Merge "Optimize hot launching recents" into oc-dev
Andy Hung [Tue, 16 May 2017 19:32:27 +0000 (12:32 -0700)]
AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION
Test: CTS AudioSecurityTest
Bug:
38346284
Change-Id: I96b4995c2d11b4a33c4b2fa6987922e26c91d336
Makoto Onuki [Mon, 15 May 2017 16:29:34 +0000 (09:29 -0700)]
Restrict access to instant app data in usage stats
- Events are obfuscated based on whether the app was instant or not at
the time each event was logged.
- UsageStats are obfuscated based on whether each app is instant or
not at the moment.
Bug
38202133
Test: Manual test using UsageStatsTest and instant apps
Change-Id: I3c74309196b88d010d317cb0dd6749bf4624e876
Grace Chen [Tue, 16 May 2017 19:30:25 +0000 (19:30 +0000)]
Merge "Support different SIM power states"
Jeremy Joslin [Tue, 16 May 2017 19:02:40 +0000 (19:02 +0000)]
Merge "Remove deprecated recommendation request code." into oc-dev
am:
b2bd32929b
Change-Id: I0efb561f7829598eb5a509474e1a6e54e00bb93d
Chris Wren [Tue, 16 May 2017 19:00:06 +0000 (19:00 +0000)]
Merge "catch USER_ALL in badging check" into oc-dev
am:
3a01c85646
Change-Id: Icf5dc0fd6fd5d2686de01b3f053c211ffb8abb25
Bill Yi [Tue, 16 May 2017 18:56:37 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4dc5766846 -s ours
Change-Id: I078ec6f2ba23670a233f069c578a9a65c2e21c23
Todd Kennedy [Mon, 15 May 2017 17:25:02 +0000 (10:25 -0700)]
Always add the instant app installer
Even if we filter out an instant app because the caller doesn't
have access to it, always make sure to add the installer when
we have the possibility of an instant app.
NOTE: This does not have CTS tests since it's impossible to test
without involving the resolver. CTS tests will be added in MR1+
when we can make changes to the APIs and add the necessary methods
to mock out the resolver service.
Change-Id: I92c88eb04520c0c5e0c58db6d668ed0a0e552a35
Fixes:
38268052
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Bill Yi [Tue, 16 May 2017 18:46:55 +0000 (18:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
560571fee3 -s ours
Change-Id: If76ba6cc7f39e92173fe9b236673eb49874f692d