OSDN Git Service
Jean-Michel Trivi [Wed, 17 May 2017 23:03:57 +0000 (23:03 +0000)]
Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev
am:
1daffb7aac
Change-Id: I673355773a045c40f72d9b3a8d93ae667f739491
Jean-Michel Trivi [Wed, 17 May 2017 22:51:35 +0000 (22:51 +0000)]
Merge "AudioFocusRequest: longer code sample, javadoc fixes" into oc-dev
Colin Cross [Wed, 17 May 2017 22:03:06 +0000 (22:03 +0000)]
Merge "Convert libsoundpool to Android.bp" am:
dde9ee9edd am:
e9ffa404ae
am:
13ea256d71
Change-Id: I8af55458b0bba29701249f7a8165f30055262f46
Colin Cross [Wed, 17 May 2017 21:55:19 +0000 (21:55 +0000)]
Merge "Convert libsoundpool to Android.bp" am:
dde9ee9edd
am:
e9ffa404ae
Change-Id: I792b4f48d57181b4ee55b2a73c597272826844e2
Colin Cross [Wed, 17 May 2017 21:45:33 +0000 (21:45 +0000)]
Merge "Convert libsoundpool to Android.bp"
am:
dde9ee9edd
Change-Id: Ia7bb54b658031c68036ee2a218e5b229d32b1d25
Treehugger Robot [Wed, 17 May 2017 21:31:16 +0000 (21:31 +0000)]
Merge "Convert libsoundpool to Android.bp"
Phil Weaver [Wed, 17 May 2017 20:32:26 +0000 (20:32 +0000)]
Merge "Match attributes to actions for pip a11y" into oc-dev
am:
95cf170ce9
Change-Id: I992904b2062bed551ea0587797b99fc26b74711f
Phil Weaver [Wed, 17 May 2017 20:25:44 +0000 (20:25 +0000)]
Merge "Match attributes to actions for pip a11y" into oc-dev
Colin Cross [Tue, 16 May 2017 20:08:19 +0000 (13:08 -0700)]
Convert libsoundpool to Android.bp
See build/soong/README.md for more information.
Test: m -j checkbuild
Change-Id: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
Merged-In: If0b7cb1e2c86ff1be41c00d98fd9ddec31287a53
(cherry picked from commit
98c127f8cc652d1179871ad47cac99d15ea1a5a0)
Tyler Gunn [Wed, 17 May 2017 20:21:43 +0000 (20:21 +0000)]
Merge "Add config option to enable/disable pause workaround." into oc-dev
am:
93db1a698c
Change-Id: Ie7acf6e3ed77d28c2d1ccfdb690f559987d3b6cf
Tyler Gunn [Wed, 17 May 2017 20:05:16 +0000 (20:05 +0000)]
Merge "Add config option to enable/disable pause workaround." into oc-dev
Alex Sakhartchouk [Wed, 17 May 2017 19:54:08 +0000 (19:54 +0000)]
Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev
am:
13fb1d3471
Change-Id: If884fd4aa24911db3652926f0941f58048c58448
TreeHugger Robot [Wed, 17 May 2017 19:43:53 +0000 (19:43 +0000)]
Merge "We notify VR Core when a 2D intent is running in VR in persistent mode." into oc-dev
Adam Lesinski [Wed, 17 May 2017 19:28:43 +0000 (19:28 +0000)]
Merge "AAPT2: Update locale script filtering logic" into oc-dev
am:
3cd6e0bee5
Change-Id: Ie5377066de50d828f9f0a183c9dab4ee41f433eb
Winson Chung [Wed, 17 May 2017 19:26:24 +0000 (19:26 +0000)]
Merge "Fix call to get the current user id from a secondary SystemUI process." into oc-dev
am:
2349481d62
Change-Id: I65bea4faf799ea1b5d02ff1c4c514485f174ff1f
Adam Lesinski [Wed, 17 May 2017 19:15:59 +0000 (19:15 +0000)]
Merge "AAPT2: Update locale script filtering logic" into oc-dev
Android Build Merger (Role) [Wed, 17 May 2017 19:14:11 +0000 (19:14 +0000)]
Merge "Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am:
c695e44866" into oc-dev-plus-aosp
Antony Sargent [Wed, 17 May 2017 19:12:24 +0000 (19:12 +0000)]
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
am:
c695e44866
Change-Id: I26f967140184851eb61ddd8def352133995f3637
Android Build Merger (Role) [Wed, 17 May 2017 19:11:55 +0000 (19:11 +0000)]
Merge "Merge "Purge Nonexistent User Jobs on Boot" into oc-dev am:
a61f09f657" into oc-dev-plus-aosp
Michael Wachenschwanz [Wed, 17 May 2017 19:10:44 +0000 (19:10 +0000)]
Merge "Purge Nonexistent User Jobs on Boot" into oc-dev
am:
a61f09f657
Change-Id: Ic96e165de9014b1d56ac322fcf2918458b1dd251
Winson Chung [Wed, 17 May 2017 19:10:35 +0000 (19:10 +0000)]
Merge "Fix call to get the current user id from a secondary SystemUI process." into oc-dev
Android Build Merger (Role) [Wed, 17 May 2017 19:10:15 +0000 (19:10 +0000)]
Merge "Merge "Stop system process crash in TouchExplorer" into oc-dev am:
be70141ed6" into oc-dev-plus-aosp
Phil Weaver [Wed, 17 May 2017 19:09:11 +0000 (19:09 +0000)]
Merge "Stop system process crash in TouchExplorer" into oc-dev
am:
be70141ed6
Change-Id: I9b708860ca7fbb51088248b35fb8f88e771fa759
Android Build Merger (Role) [Wed, 17 May 2017 19:08:43 +0000 (19:08 +0000)]
Merge "Merge "Optimize App -> Recents" into oc-dev am:
22f8290879" into oc-dev-plus-aosp
Jorim Jaggi [Wed, 17 May 2017 19:07:36 +0000 (19:07 +0000)]
Merge "Optimize App -> Recents" into oc-dev
am:
22f8290879
Change-Id: Ia9c279622c7b470679bc29e7372f190937684aae
TreeHugger Robot [Wed, 17 May 2017 18:59:48 +0000 (18:59 +0000)]
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
Michael Wachenschwanz [Wed, 17 May 2017 18:58:06 +0000 (18:58 +0000)]
Merge "Purge Nonexistent User Jobs on Boot" into oc-dev
Phil Weaver [Wed, 17 May 2017 18:53:43 +0000 (18:53 +0000)]
Merge "Stop system process crash in TouchExplorer" 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
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
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
TreeHugger Robot [Wed, 17 May 2017 18:15:37 +0000 (18:15 +0000)]
Merge "Optimize App -> Recents" 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
TreeHugger Robot [Wed, 17 May 2017 18:09:47 +0000 (18:09 +0000)]
Merge "Fix TimePicker crash on rotation." into oc-dev
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
Alex Sakhartchouk [Wed, 17 May 2017 16:34:53 +0000 (12:34 -0400)]
We notify VR Core when a 2D intent is running in VR in persistent mode.
One of the paths that sends these notifications incorrectly indicated
that a VR app was not running. Fix the callsite to include the current
VR component instead of null.
Bug:
38004624
Test: Launch VR app, verify null component is not sent to VR core
while it's running.
Change-Id: I0589ee51952a503bfddec214999ed5bce48715ba
Winson Chung [Wed, 17 May 2017 17:46:49 +0000 (10:46 -0700)]
Fix call to get the current user id from a secondary SystemUI process.
- The secondary SystemUI process's KeyguardUpdateMonitor is not updated
so we can't rely on it to get the current user id.
Bug:
38372598
Test: Switch users, launch some tasks, and switch back. Ensure that original
tasks still exist
Change-Id: I26a7c70b5f7032a106dc1342c8b366e4797e8fa0
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
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
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
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
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
Treehugger Robot [Wed, 17 May 2017 17:24:02 +0000 (17:24 +0000)]
Merge "Fix for Bluetooth not restarting on User Switch"
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
Phil Weaver [Tue, 16 May 2017 23:23:18 +0000 (16:23 -0700)]
Stop system process crash in TouchExplorer
We need to straighten out this state machine so we can
fix bugs in it without a high risk of creating others
(b/
38246304). In the meantime, catching this exception at
least allows the device to keep operating.
Bug:
37338581
Test: Reproduced the conditions of the crash. Verified that
we now print the log message.
Change-Id: I1f4f84b5529b2bf638e225d474808e3d42484e78
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
Tyler Gunn [Mon, 15 May 2017 18:43:25 +0000 (11:43 -0700)]
Add config option to enable/disable pause workaround.
Test: Manual/unit
Bug:
35304446
Change-Id: I9a0c73ce62812a87e30d9759a0d205ffa282caf2
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
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
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
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
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
Michael Wachenschwanz [Mon, 15 May 2017 20:53:09 +0000 (13:53 -0700)]
Purge Nonexistent User Jobs on Boot
In the case that a user has been removed but their jobs still exist on
disk, the JobSchedulerService will remove all jobs not associated with
current users on boot.
Exposed UserManagerService#getUserIds() via UserManagerInternal for
quick user id retrieval.
Fixes:
38261977
Test: manual
Change-Id: Id4b3c0a4142b4818fcd875eef18ea03f3c45ca40
Signed-off-by: Michael Wachenschwanz <mwachens@google.com>
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
Jean-Michel Trivi [Tue, 16 May 2017 01:49:33 +0000 (18:49 -0700)]
AudioFocusRequest: longer code sample, javadoc fixes
Test: make -j offline-sdk-docs
Bug:
38124458
Change-Id: I18e83175f6919fd6afeae9475c00eded829cb96a
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
Adam Lesinski [Tue, 16 May 2017 22:26:54 +0000 (15:26 -0700)]
AAPT2: Update locale script filtering logic
AAPT got an update to its locale script filtering logic that
dealt with enabling the removal of specific locales like
b+sr+Latn. Update AAPT2 to do the same.
Bug:
28055669
Bug:
29412034
Test: aapt2_tests
Change-Id: I3315c0814796cff05dfa1032d66d0306fe2b12bc
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