OSDN Git Service
Adam Lesinski [Wed, 28 Jun 2017 01:39:07 +0000 (18:39 -0700)]
AAPT2: Iterate over UTF-8 string by codepoints
Iterating over a UTF-8 string by codepoints ensures that
unicode characters do not get sliced. Otherwise the resulting
string could contain malformed characters.
Bug:
62839202
Test: make aapt2_tests
Change-Id: Ia0c44fbceb7dcfa11e77a1a77011da0f5466e342
Adam Lesinski [Fri, 30 Jun 2017 01:12:35 +0000 (01:12 +0000)]
Merge "AAPT2: Auto-version adaptive-icon XML"
Ricardo Loo [Fri, 30 Jun 2017 01:08:24 +0000 (01:08 +0000)]
Merge "Merge "docs: Updated isAutofillSupported description." into oc-dev am:
a89dfb5439 am:
a8bccb6674" into oc-dr1-dev-plus-aosp
am:
e9ea572c76
Change-Id: Idee678a31a85371a8630ba2f6f637970e9f995c8
Ricardo Loo [Fri, 30 Jun 2017 01:06:58 +0000 (01:06 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev am:
a89dfb5439 am:
824b41d77a
am:
a29c9a9466
Change-Id: Id7b3e0f72b60b0450aa9b6aa181faae8a22109e7
Android Build Merger (Role) [Fri, 30 Jun 2017 01:00:25 +0000 (01:00 +0000)]
Merge "Merge "docs: Updated isAutofillSupported description." into oc-dev am:
a89dfb5439 am:
a8bccb6674" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 30 Jun 2017 00:59:53 +0000 (00:59 +0000)]
Merge "Enable priority boost for non-Jack builds."
Ricardo Loo [Fri, 30 Jun 2017 00:59:23 +0000 (00:59 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev am:
a89dfb5439
am:
a8bccb6674
Change-Id: Ie60b3eb45178fd4f8a6dff3d860f1195ba3a847e
Ricardo Loo [Fri, 30 Jun 2017 00:59:20 +0000 (00:59 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev am:
a89dfb5439
am:
824b41d77a
Change-Id: Ie9593ce8239fc8c5f0e8dd40bc513c1edcb849a1
Ricardo Loo [Fri, 30 Jun 2017 00:51:57 +0000 (00:51 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
am:
a89dfb5439
Change-Id: Ibaa0fd7bcbb1fa4eb880a53894fbf94d857f334f
Ricardo Loo [Fri, 30 Jun 2017 00:51:55 +0000 (00:51 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
am:
a89dfb5439
Change-Id: Ie43f37efa9e268b04dbad09ad04795089de68adf
Chet Haase [Fri, 30 Jun 2017 00:49:19 +0000 (00:49 +0000)]
Merge "Merge "Add docs for new padding/margin attributes." into oc-dev am:
8cdbd6e184 am:
1040b18dc3" into oc-dr1-dev-plus-aosp
am:
5d6966b46f
Change-Id: I728bd5264e9ef0e137e4db1423ee6ccfd4eecb33
Chet Haase [Fri, 30 Jun 2017 00:47:56 +0000 (00:47 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev am:
8cdbd6e184 am:
d73f6a985d
am:
95e6c38eb0
Change-Id: Id397296039d2ca9bd8fe6bf4130a3308296843da
Ricardo Loo [Fri, 30 Jun 2017 00:44:50 +0000 (00:44 +0000)]
Merge "docs: Updated isAutofillSupported description." into oc-dev
Android Build Merger (Role) [Fri, 30 Jun 2017 00:41:13 +0000 (00:41 +0000)]
Merge "Merge "Add docs for new padding/margin attributes." into oc-dev am:
8cdbd6e184 am:
1040b18dc3" into oc-dr1-dev-plus-aosp
Chet Haase [Fri, 30 Jun 2017 00:39:54 +0000 (00:39 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev am:
8cdbd6e184
am:
1040b18dc3
Change-Id: I8add96e5d8817413500e7763afb77715be3ca703
Chet Haase [Fri, 30 Jun 2017 00:39:52 +0000 (00:39 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev am:
8cdbd6e184
am:
d73f6a985d
Change-Id: I3e9a5533093efe5ecdcc908432ec476f081548f5
Chet Haase [Fri, 30 Jun 2017 00:32:27 +0000 (00:32 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
am:
8cdbd6e184
Change-Id: I0d82ace7d340af8f66a6233ce5b474d26595c38f
Chet Haase [Fri, 30 Jun 2017 00:32:26 +0000 (00:32 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
am:
8cdbd6e184
Change-Id: Iacf5e069e0e6a2b38a1566f36f81ab8de693e634
Makoto Onuki [Fri, 30 Jun 2017 00:29:41 +0000 (00:29 +0000)]
Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev am:
09e1fae73f
am:
a43c0948f8
Change-Id: If0848f8642cdf3610e950181143f412aebfe1ee4
TreeHugger Robot [Fri, 30 Jun 2017 00:21:28 +0000 (00:21 +0000)]
Merge "Add docs for new padding/margin attributes." into oc-dev
Makoto Onuki [Fri, 30 Jun 2017 00:19:06 +0000 (00:19 +0000)]
Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev
am:
09e1fae73f
Change-Id: If7c7fe80a450d0151efeb2ea26e7bfedd6a4a04f
Sundeep Ghuman [Fri, 30 Jun 2017 00:12:32 +0000 (00:12 +0000)]
Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev am:
635575d579
am:
b7c4518d57
Change-Id: I7da1349402f57d94f450a0d1d4e85864a1fafb5d
TreeHugger Robot [Fri, 30 Jun 2017 00:08:52 +0000 (00:08 +0000)]
Merge "Add boot/shutdown timing to sync detailed logging" into oc-dr1-dev
Sundeep Ghuman [Fri, 30 Jun 2017 00:05:43 +0000 (00:05 +0000)]
Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev
am:
635575d579
Change-Id: I2f962bc6b2c2c8eda54ed8d9578922bd67e441dc
Sundeep Ghuman [Thu, 29 Jun 2017 23:56:55 +0000 (23:56 +0000)]
Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev
Evan Laird [Thu, 29 Jun 2017 23:35:54 +0000 (23:35 +0000)]
Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev am:
a8abb9d586
am:
1abed96262
Change-Id: I93134aaee5c7616fc7a08834f24a0bb438d3668f
Evan Laird [Thu, 29 Jun 2017 23:28:06 +0000 (23:28 +0000)]
Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev
am:
a8abb9d586
Change-Id: I7ae1b22a70a73d761dc4cea6c6892100261394af
Sudheer Shanka [Thu, 29 Jun 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Fix UserLifecycleTest."
TreeHugger Robot [Thu, 29 Jun 2017 23:19:58 +0000 (23:19 +0000)]
Merge "Update auto rotate / portrait QS icon" into oc-dr1-dev
John Reck [Thu, 29 Jun 2017 23:05:09 +0000 (23:05 +0000)]
Merge "Fix use-after-free"
Christopher Tate [Thu, 29 Jun 2017 22:44:38 +0000 (22:44 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev am:
2de66f7be1
am:
0d95a0eefa
Change-Id: I9b5f7e4b60534d42728d54f5dd40320dbc518885
Chavi Weingarten [Thu, 29 Jun 2017 22:41:05 +0000 (22:41 +0000)]
Merge "Added Activity flags to show on lock screen."
Nate Fischer [Thu, 29 Jun 2017 22:35:18 +0000 (22:35 +0000)]
Merge "WebView: add APIs for setSafeBrowsingWhiteList"
Christopher Tate [Thu, 29 Jun 2017 22:34:22 +0000 (22:34 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
am:
2de66f7be1
Change-Id: Id453b9477272c8d10738a06626411dfda58cea74
TreeHugger Robot [Thu, 29 Jun 2017 22:26:34 +0000 (22:26 +0000)]
Merge "Don't synchronize inside getWallpaperColors()" into oc-dr1-dev
Hall Liu [Thu, 29 Jun 2017 22:06:23 +0000 (22:06 +0000)]
Merge "Implement cancelDownload and remove appName" am:
9b43ffcf2f am:
4b1acf4421 am:
4c751c865a
am:
949b625c57
Change-Id: Iafa6c3b23ba2957e8a303f6190b32e801f6c047f
Hall Liu [Thu, 29 Jun 2017 21:58:22 +0000 (21:58 +0000)]
Merge "Implement cancelDownload and remove appName" am:
9b43ffcf2f am:
4b1acf4421
am:
4c751c865a
Change-Id: I05814ffe8fb4ca2f334d6c0ecd772295bc2c7c63
Jerry Zhang [Thu, 29 Jun 2017 21:54:39 +0000 (21:54 +0000)]
Merge "Broadcast only if boot complete"
Hall Liu [Thu, 29 Jun 2017 21:51:13 +0000 (21:51 +0000)]
Merge "Implement cancelDownload and remove appName" am:
9b43ffcf2f
am:
4b1acf4421
Change-Id: Ic6d19500c335bc40e6d14d009d4d459bf02b06e1
Hall Liu [Thu, 29 Jun 2017 21:45:47 +0000 (21:45 +0000)]
Merge "Implement cancelDownload and remove appName"
am:
9b43ffcf2f
Change-Id: I98914bf79ad6178e1ef8689acf5d0a18c78a7735
Santos Cordon [Thu, 29 Jun 2017 21:38:42 +0000 (21:38 +0000)]
Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev am:
67143a8cfc
am:
99eac47966
Change-Id: I5fb247a2291ee4fdc96b25e297cb7f7e0ec49d5a
Hall Liu [Thu, 29 Jun 2017 21:33:11 +0000 (21:33 +0000)]
Merge "Implement cancelDownload and remove appName"
Santos Cordon [Thu, 29 Jun 2017 21:31:53 +0000 (21:31 +0000)]
Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
am:
67143a8cfc
Change-Id: I9a65c8a9c33ffe4a982d090966654f4e93690c3b
Santos Cordon [Thu, 29 Jun 2017 21:21:42 +0000 (21:21 +0000)]
Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev
Makoto Onuki [Thu, 29 Jun 2017 21:11:14 +0000 (14:11 -0700)]
Add boot/shutdown timing to sync detailed logging
Bug
63136907
Test: manual test
Change-Id: I141f32f90579e2676af616f21254774d64a37c31
Doris Ling [Thu, 29 Jun 2017 20:57:13 +0000 (20:57 +0000)]
Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev am:
18f3adc03a
am:
33dbb7d0e5
Change-Id: I3c39229e1725029f9822bb8fa8d6d47781f8ebc4
Doris Ling [Thu, 29 Jun 2017 20:49:39 +0000 (20:49 +0000)]
Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev
am:
18f3adc03a
Change-Id: I04b7160390a4c3cdee6f0355e3aeb0fdee0a4719
Sundeep Ghuman [Thu, 29 Jun 2017 20:43:43 +0000 (20:43 +0000)]
Merge "Move TestAccessPointBuilder." into oc-dr1-dev am:
80139bfc4d
am:
2a3219af74
Change-Id: I131be0573105670b8230f41f77fce83cac6b82ba
TreeHugger Robot [Thu, 29 Jun 2017 20:41:47 +0000 (20:41 +0000)]
Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev
Sundeep Ghuman [Thu, 29 Jun 2017 20:37:53 +0000 (20:37 +0000)]
Merge "Move TestAccessPointBuilder." into oc-dr1-dev
am:
80139bfc4d
Change-Id: I6d1ad70e691c5ef0712afa79a9c96160b6559cd5
chaviw [Tue, 13 Jun 2017 19:05:44 +0000 (12:05 -0700)]
Added Activity flags to show on lock screen.
Added two new flags to the Activity to turn the screen on and
show on the lock screen. These can be used instead of the Window flags
LayouParams.FLAG_TURN_SCREEN_ON and LayoutParams.FLAG_SHOW_WHEN_LOCKED
to prevent the double onStart/onResume lifecycle events.
The flags can be set as an attr for the Activity in the AndroidManifest
using android:showWhenLocked="true" and android:turnScreenOn="true".
They can also be set through methods in the Activity class using
setShowWhenLocked(true) and setTurnScreen(true).
Fixes:
36850100
Test: Created sample application, tests/ShowWhenLockedApp, that set the
flags in the manifest and code. Tested multiple scenarios to
launch the Activity with the flags set and unset.
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.KeyguardTransitionTests
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.ActivityManagerActivityVisibilityTests
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesHostTestCases -t android.server.cts.KeyguardTests
Change-Id: I44f0e313df4531d49c7ac56108b6bf80e41fefc1
TreeHugger Robot [Thu, 29 Jun 2017 20:31:23 +0000 (20:31 +0000)]
Merge "Move TestAccessPointBuilder." into oc-dr1-dev
Sundeep Ghuman [Tue, 27 Jun 2017 00:13:00 +0000 (17:13 -0700)]
Move generatePreferenceKey to AccessPointPreference.
This allows it to be reused in the SavedAccessPointsWifiSettings.
Bug: b/
62374459
Test: make -j40 RunSettingsLibRoboTests
Change-Id: Id137f56ceafe461d217c0eee6b571ccfa4eaff1f
Paul McLean [Thu, 29 Jun 2017 19:42:04 +0000 (19:42 +0000)]
Merge "Adding USB Headset awareness." into oc-dr1-dev am:
f56b57781e
am:
1ae4273154
Change-Id: I24ffbb79b965df15a22dbc5d6ce3ae90ddb27b50
Evan Laird [Thu, 29 Jun 2017 18:32:00 +0000 (14:32 -0400)]
Update auto rotate / portrait QS icon
Animations and new icon for auto rotate. No landscape included here.
Test: visual
Bug:
62386498
Change-Id: If2862c24bed78be2110b2d58d1b4326b04b40c9d
Hyunyoung Song [Thu, 29 Jun 2017 19:33:54 +0000 (19:33 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev am:
e54ad58aea
am:
73035910fc
Change-Id: I43e867115e6242ef5a19795c8e53cccb5097d633
Paul McLean [Thu, 29 Jun 2017 19:33:36 +0000 (19:33 +0000)]
Merge "Adding USB Headset awareness." into oc-dr1-dev
am:
f56b57781e
Change-Id: I994d9d6f327a204916fe9145cc6ce9a2b511d307
Hyunyoung Song [Thu, 29 Jun 2017 19:27:30 +0000 (19:27 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev
am:
e54ad58aea
Change-Id: I01b6fd2391e1296546291af5db5a4663e67fae01
TreeHugger Robot [Thu, 29 Jun 2017 19:25:09 +0000 (19:25 +0000)]
Merge "Adding USB Headset awareness." into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 19:18:52 +0000 (19:18 +0000)]
Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev
Sujith Ramakrishnan [Thu, 29 Jun 2017 19:17:21 +0000 (19:17 +0000)]
Merge "Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be am:
98b181b25f" into oc-dr1-dev-plus-aosp
am:
e3a9c1e1e4
Change-Id: Ibdbbcaf171b48c6027c65a03d2ba843d070d01c5
Sujith Ramakrishnan [Thu, 29 Jun 2017 19:15:40 +0000 (19:15 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be am:
a1157b3aa1
am:
708857daac
Change-Id: I1432893fffc95498d4bcb085b04856b1293f51a2
Sudheer Shanka [Mon, 26 Jun 2017 02:40:53 +0000 (19:40 -0700)]
Fix UserLifecycleTest.
Bug:
62058707
Test: bit MultiUserPerfTests:android.multiuser.UserLifecycleTest
Change-Id: I8667190f001f609040a977a19aa956d7064ccc18
Android Build Merger (Role) [Thu, 29 Jun 2017 19:07:39 +0000 (19:07 +0000)]
Merge "Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be am:
98b181b25f" into oc-dr1-dev-plus-aosp
Sujith Ramakrishnan [Thu, 29 Jun 2017 19:06:36 +0000 (19:06 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be
am:
98b181b25f
Change-Id: Ic87422062ac28fb51596af2a7665b228b446b98a
Sujith Ramakrishnan [Thu, 29 Jun 2017 19:06:33 +0000 (19:06 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am:
564d0bf1be
am:
a1157b3aa1
Change-Id: I80fac516afe2c7b75fe775d80444a501585bd3b7
Santos Cordon [Tue, 13 Jun 2017 00:57:17 +0000 (17:57 -0700)]
Add ability to turn off VR virtual display functionality.
Add flag to enable/disable virtual displays via the existing
setDisplayProperties API. This makes it possible for the VR system
to turn off virtual displays if necessary after we ship.
Bug:
62546364
Test: Run 'adb shell vr enable-virtual-display [true|false] to toggle while 2d in 3d
runs.
Change-Id: Iae029be501d61189fced981dbc554e984fa7ed4b
Sujith Ramakrishnan [Thu, 29 Jun 2017 18:59:11 +0000 (18:59 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am:
564d0bf1be
Change-Id: I23deb9056dbd9967bfe07d3db30256794b30a778
Sujith Ramakrishnan [Thu, 29 Jun 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am:
564d0bf1be
Change-Id: I1cd59a2966f692a4857343e21bf1586719939490
TreeHugger Robot [Thu, 29 Jun 2017 18:50:08 +0000 (18:50 +0000)]
Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
Jerry Zhang [Thu, 29 Jun 2017 18:11:52 +0000 (11:11 -0700)]
Broadcast only if boot complete
Accessory connects / disconnects can occur before
boot complete, so don't broadcast intents if that
is the case.
Bug:
63114621
Test: connect/disconnect an accessory
Change-Id: Ib8f9eb97ce1630004511fcc1fb84594ccc812c06
Jack He [Thu, 29 Jun 2017 18:14:07 +0000 (18:14 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)" am:
874af710b7 am:
9fd5d0da1e am:
8d9e7be8e4
am:
ce310115b4
Change-Id: I8abd50f89acf5d749ef75099e0618e848ad7f73c
TreeHugger Robot [Thu, 29 Jun 2017 18:07:15 +0000 (18:07 +0000)]
Merge "Remove visibleBehind functionality"
Jack He [Thu, 29 Jun 2017 18:06:33 +0000 (18:06 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)" am:
874af710b7 am:
9fd5d0da1e
am:
8d9e7be8e4
Change-Id: I211c5bfda4b9a2e2139e2c516716f83ad726e944
Tomasz Wasilczyk [Thu, 29 Jun 2017 18:02:37 +0000 (18:02 +0000)]
Merge "Add AM/FM check for BandDescriptor."
Jack He [Thu, 29 Jun 2017 17:58:13 +0000 (17:58 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)" am:
874af710b7
am:
9fd5d0da1e
Change-Id: If22202112ad66a7b8d86438ca5d2947cf1842b8a
Justin Klaassen [Thu, 29 Jun 2017 17:54:29 +0000 (17:54 +0000)]
Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev am:
13d5f05350
am:
3d42cbba7e
Change-Id: I905ac1ec9d8f9244b2ff614e7b00c6a6eea7760c
Jack He [Thu, 29 Jun 2017 17:53:10 +0000 (17:53 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)"
am:
874af710b7
Change-Id: Id65e6e11308c66893cb701af8909df9fee3a131f
Jack He [Thu, 29 Jun 2017 17:47:34 +0000 (17:47 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am:
c79c4240ec am:
c286110c1a am:
b01caeeb94
am:
0b55cc588f
Change-Id: I83d598d0fc9dd52d245e00ad39e6ed727005290a
Justin Klaassen [Thu, 29 Jun 2017 17:47:31 +0000 (17:47 +0000)]
Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev
am:
13d5f05350
Change-Id: Ic0bbf06e495f67ce50955e8db8d853852b5b8f0e
Treehugger Robot [Thu, 29 Jun 2017 17:44:10 +0000 (17:44 +0000)]
Merge "Support battery level reporting via Apple VSC (1/2)"
Jack He [Wed, 21 Jun 2017 00:09:47 +0000 (17:09 -0700)]
Support battery level reporting via Apple VSC (1/2)
* Add related constants to BluetoothHeadset
Bug:
35874078
Test: make, test with supporting headsets
Change-Id: I9f49ea28efdf6de0e751a377d879fe13a47655d5
Jack He [Thu, 29 Jun 2017 17:40:30 +0000 (17:40 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am:
c79c4240ec am:
c286110c1a
am:
b01caeeb94
Change-Id: I0c35a8cd009940262e0055633b268a2da8fc11fc
TreeHugger Robot [Thu, 29 Jun 2017 17:38:13 +0000 (17:38 +0000)]
Merge "Add @*android:bool/config_defaultRingtonePickerEnabled" into oc-dr1-dev
Wyatt Riley [Thu, 29 Jun 2017 17:37:10 +0000 (17:37 +0000)]
Merge "Ensure complete GnssStatus construction" into oc-dr1-dev am:
e327572e36
am:
9c92ce159c
Change-Id: I55ec21fcaa6b59164d9ce37da314d176d7788a48
John Reck [Thu, 29 Jun 2017 17:35:17 +0000 (17:35 +0000)]
Merge "Add SharedMemory API"
Jack He [Thu, 29 Jun 2017 17:32:35 +0000 (17:32 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)" am:
c79c4240ec
am:
c286110c1a
Change-Id: I37cb48012b0f7170415693476d7e9f105798d814
John Reck [Thu, 29 Jun 2017 17:26:44 +0000 (10:26 -0700)]
Fix use-after-free
Change-Id: I8ac1ede5b29f718aa145e18cf1cc057722b62f2b
Fixes:
62810849
Test: Builds
Wyatt Riley [Thu, 29 Jun 2017 17:28:47 +0000 (17:28 +0000)]
Merge "Ensure complete GnssStatus construction" into oc-dr1-dev
am:
e327572e36
Change-Id: Idc1ca1c01f8b77cd4ba7e1780335b9e0dea2b656
Jack He [Thu, 29 Jun 2017 17:25:26 +0000 (17:25 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)"
am:
c79c4240ec
Change-Id: I6aa50e541763adfa9ebe738d98d86152cf0cd1d5
TreeHugger Robot [Thu, 29 Jun 2017 17:18:14 +0000 (17:18 +0000)]
Merge "Ensure complete GnssStatus construction" into oc-dr1-dev
Treehugger Robot [Thu, 29 Jun 2017 17:17:38 +0000 (17:17 +0000)]
Merge "Support battery level reporting via Plantronics XEVENT (1/2)"
Jack He [Wed, 21 Jun 2017 00:07:40 +0000 (17:07 -0700)]
Support battery level reporting via Plantronics XEVENT (1/2)
* Add related constants to BluetoothHeadset
Bug:
35874078
Test: make, test with supporting headsets
Change-Id: Ied089a065bf9caa0d03f681950fefa2ea990bb3e
Chris Wren [Thu, 29 Jun 2017 17:07:17 +0000 (17:07 +0000)]
Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev am:
325706f143
am:
d0a0cb32bf
Change-Id: Ie3a0c67fd2ce92098771b3fff27f61db016f2828
Selim Cinek [Thu, 29 Jun 2017 17:05:52 +0000 (17:05 +0000)]
Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev am:
aa481d695d
am:
f55beccb2f
Change-Id: Ib2c2681f6c219d5b8206280341904effe104b540
Chris Wren [Thu, 29 Jun 2017 16:58:45 +0000 (16:58 +0000)]
Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev
am:
325706f143
Change-Id: I0a597ec06a40f97dea3edcd8a4807040c742b1d9
Fyodor Kupolov [Thu, 29 Jun 2017 16:58:31 +0000 (16:58 +0000)]
Merge "Do not hold PM lock when calling AppOpsService.removeUser"
Selim Cinek [Thu, 29 Jun 2017 16:57:31 +0000 (16:57 +0000)]
Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev
am:
aa481d695d
Change-Id: I9b4fb988b6db2cd16a5e78a67ab53948746d6488
TreeHugger Robot [Thu, 29 Jun 2017 16:49:46 +0000 (16:49 +0000)]
Merge "add an auto-merge guard to the metrics constants file" into oc-dr1-dev
Sundeep Ghuman [Mon, 19 Jun 2017 23:56:41 +0000 (16:56 -0700)]
Move TestAccessPointBuilder.
This is necessary to make it accessible to other test packages, such as
WifiSettingsUiTest.java in packages/apps/Settings.
Bug:
37558394
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Ic1e4185639b2947433d6371e74448097d6adb962
OSDN Git Service
