OSDN Git Service
Bill Yi [Wed, 20 Feb 2019 04:45:32 +0000 (20:45 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
e6b0455e71 -s ours
am:
b8836a4941 -s ours
am skip reason: subject contains skip directive
Change-Id: I6193ff11287705f8ba889592530f660ec6046ca1
Bill Yi [Wed, 20 Feb 2019 04:43:50 +0000 (20:43 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
c691b7e52c -s ours
am:
94f6de35be -s ours
am skip reason: subject contains skip directive
Change-Id: I4586d58180b40099fb0f5cdc0b4ba27b4d21356f
Bill Yi [Wed, 20 Feb 2019 04:41:52 +0000 (20:41 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
6670b2287a -s ours
am:
e57adcce2a -s ours
am skip reason: subject contains skip directive
Change-Id: I35b8d1f2960bc4dcf018e39e1bd890d837f834bf
Bill Yi [Wed, 20 Feb 2019 04:40:18 +0000 (20:40 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
85c48edc69 -s ours
am:
4f522f602a -s ours
am skip reason: subject contains skip directive
Change-Id: I73d825f8d67573b315f4d0081f402552f387a2b2
Bill Yi [Wed, 20 Feb 2019 04:38:19 +0000 (20:38 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
8dfcae263a -s ours
am:
581268f5c0 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib5f32919ef5d60098b4f7c8e9a5bb6c8df08c586
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 04:36:12 +0000 (20:36 -0800)]
[automerger skipped] Merge "Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229 am:
2938bf23f7" into pi-dev-plus-aosp
am:
34cef65998 -s ours
am skip reason: change_id I51199eaf0bd87055c21fe61af50f4c353137d621 with SHA1
19661a4b4a is in history
Change-Id: I01678eab314d25c8df495d050e1228bcb4865c68
TreeHugger Robot [Wed, 20 Feb 2019 04:29:30 +0000 (04:29 +0000)]
Merge "Move the block bg activity starts toast msg to string resources"
TreeHugger Robot [Wed, 20 Feb 2019 04:29:01 +0000 (04:29 +0000)]
Merge "Fix logging string"
Android Build Merger (Role) [Wed, 20 Feb 2019 04:27:44 +0000 (04:27 +0000)]
Merge "[automerger skipped] Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229 am:
2938bf23f7 am:
4d67623dad -s ours am skip reason: change_id I51199eaf0bd87055c21fe61af50f4c353137d621 with SHA1
19661a4b4a is in history"
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 04:26:13 +0000 (20:26 -0800)]
[automerger skipped] Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229 am:
2938bf23f7
am:
4d67623dad -s ours
am skip reason: change_id I51199eaf0bd87055c21fe61af50f4c353137d621 with SHA1
19661a4b4a is in history
Change-Id: I12753f34de77e5cca1dc0e67689916dea445052b
TreeHugger Robot [Wed, 20 Feb 2019 04:14:55 +0000 (04:14 +0000)]
Merge "Sharesheet - Support sharing from downloads"
TreeHugger Robot [Wed, 20 Feb 2019 04:04:18 +0000 (04:04 +0000)]
Merge "New Augmented Autofill APIs: onConnected() and onDisconnected()"
TreeHugger Robot [Wed, 20 Feb 2019 03:55:40 +0000 (03:55 +0000)]
Merge "Switching off ART verifications for debuggable apps (dev option-controlled)."
TreeHugger Robot [Wed, 20 Feb 2019 03:41:56 +0000 (03:41 +0000)]
Merge "Generate realistic preview images of custom clock faces."
Bill Yi [Wed, 20 Feb 2019 03:38:11 +0000 (19:38 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
e6b0455e71 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic7e1612ccf2bef010ff52ce5fcfaed947f53588f
Bill Yi [Wed, 20 Feb 2019 03:36:30 +0000 (19:36 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
c691b7e52c -s ours
am skip reason: subject contains skip directive
Change-Id: I06fa6c98d7f69830fd3b1c46637990bccdb719d7
Bill Yi [Wed, 20 Feb 2019 03:34:15 +0000 (19:34 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6670b2287a -s ours
am skip reason: subject contains skip directive
Change-Id: I64f1059af45b3e949ceadacb5fa3a6d0673cd850
Bill Yi [Wed, 20 Feb 2019 03:32:03 +0000 (19:32 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
85c48edc69 -s ours
am skip reason: subject contains skip directive
Change-Id: I959988458fa524fb31392d79c3e8dd7ec80d3da5
Bill Yi [Wed, 20 Feb 2019 03:30:27 +0000 (19:30 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
8dfcae263a -s ours
am skip reason: subject contains skip directive
Change-Id: I416874fe5e5440dc9a1a8fc89e84ab7f34638153
Bill Yi [Wed, 20 Feb 2019 03:28:18 +0000 (19:28 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
6fe3e60d9a -s ours
am:
fa3d6a0488 -s ours
am skip reason: subject contains skip directive
Change-Id: I3513e72aa6c3167f0521d961d831c370347fc807
TreeHugger Robot [Wed, 20 Feb 2019 03:27:17 +0000 (03:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Wed, 20 Feb 2019 03:26:26 +0000 (19:26 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
b3581e7602 -s ours
am:
23aa1ba617 -s ours
am skip reason: subject contains skip directive
Change-Id: I97d5420a7815b8f2c143d738edebc75b750f977f
Android Build Merger (Role) [Wed, 20 Feb 2019 03:25:43 +0000 (03:25 +0000)]
Merge "Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229 am:
2938bf23f7" into pi-dev-plus-aosp
TreeHugger Robot [Wed, 20 Feb 2019 03:25:36 +0000 (03:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:24:46 +0000 (03:24 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:24:18 +0000 (03:24 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 03:24:11 +0000 (19:24 -0800)]
Merge "Move getPhoneCount implementation back to TelephonyManager." am:
7d6e085229
am:
2938bf23f7
Change-Id: Id5d2e92feb2a40c8cd6cc3206d3b2a563abd4117
Bill Yi [Wed, 20 Feb 2019 03:23:59 +0000 (19:23 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6fe3e60d9a -s ours
am skip reason: subject contains skip directive
Change-Id: Ieb00cfb80ce0b53b1add48017ce5f448e8de8a37
TreeHugger Robot [Wed, 20 Feb 2019 03:23:28 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Wed, 20 Feb 2019 03:22:23 +0000 (19:22 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
b3581e7602 -s ours
am skip reason: subject contains skip directive
Change-Id: I09840927198a83c3c0b12729f47337fd223c2c3e
TreeHugger Robot [Wed, 20 Feb 2019 03:15:27 +0000 (03:15 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:14:37 +0000 (03:14 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 03:10:34 +0000 (19:10 -0800)]
Merge "Move getPhoneCount implementation back to TelephonyManager."
am:
7d6e085229
Change-Id: I5bca6f3d4db132fbf4a0086d38d57ccda53c2780
Hongwei Wang [Wed, 20 Feb 2019 03:09:16 +0000 (03:09 +0000)]
Merge "Adds android.media.HwAudioSource class"
Xiangyu/Malcolm Chen [Wed, 20 Feb 2019 02:58:09 +0000 (02:58 +0000)]
Merge "Move getPhoneCount implementation back to TelephonyManager."
TreeHugger Robot [Wed, 20 Feb 2019 02:43:23 +0000 (02:43 +0000)]
Merge "For automotive builds: makes sure the keyguard gets automatically dismissed after every user switch."
TreeHugger Robot [Wed, 20 Feb 2019 02:41:22 +0000 (02:41 +0000)]
Merge "Added visual affordance/handle for navigation bar"
TreeHugger Robot [Wed, 20 Feb 2019 02:21:46 +0000 (02:21 +0000)]
Merge "Don't touch empty wallpaper sentinel every backup."
Hall Liu [Wed, 20 Feb 2019 01:52:15 +0000 (17:52 -0800)]
Merge "Turn on enforcing mode for Q-based location APIs" am:
5bc4949f3f am:
7407647336
am:
2dadf15165
Change-Id: I85e0f8f0d637554de609d3b80ab5ab1e4a64afec
Ned Burns [Wed, 20 Feb 2019 01:48:12 +0000 (01:48 +0000)]
Merge "Remove doInflateSynchronous() from InflationCallback"
Etan Cohen [Wed, 20 Feb 2019 01:45:19 +0000 (01:45 +0000)]
Merge "[RTT] Deprecate old feature availability APIs"
Android Build Merger (Role) [Wed, 20 Feb 2019 01:39:54 +0000 (01:39 +0000)]
Merge "[automerger skipped] Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel" am:
9102b10a00 am:
bd50159ba9 am:
089b142729 -s ours am skip reason: change_id Ie68a02a7e0f9aabe5dbc37806a495169feb63765 with SHA1
0c86fbf491 is in history"
Shuo Qian [Wed, 20 Feb 2019 01:39:23 +0000 (17:39 -0800)]
[automerger skipped] Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel" am:
9102b10a00 am:
bd50159ba9
am:
089b142729 -s ours
am skip reason: change_id Ie68a02a7e0f9aabe5dbc37806a495169feb63765 with SHA1
0c86fbf491 is in history
Change-Id: Ia1e1663617cb14c2374f9c560211fca24d77302a
Hall Liu [Wed, 20 Feb 2019 01:37:59 +0000 (17:37 -0800)]
Merge "Turn on enforcing mode for Q-based location APIs" am:
5bc4949f3f
am:
7407647336
Change-Id: I2392be3559a6bc2052e1ae7b5acfeb5e20ac1415
TreeHugger Robot [Wed, 20 Feb 2019 01:37:29 +0000 (01:37 +0000)]
Merge "Fix pip window doesn't shift with ime and shelf."
TreeHugger Robot [Wed, 20 Feb 2019 01:32:22 +0000 (01:32 +0000)]
Merge "Don't attempt to work on empty pending starts list"
Shuo Qian [Wed, 20 Feb 2019 01:30:06 +0000 (17:30 -0800)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel" am:
9102b10a00
am:
bd50159ba9
Change-Id: I1b4523556c1457aa634dcaa579316ea4360698a1
Hall Liu [Wed, 20 Feb 2019 01:27:02 +0000 (17:27 -0800)]
Merge "Turn on enforcing mode for Q-based location APIs"
am:
5bc4949f3f
Change-Id: I5bbc816a59c8155a89109d8cc77dd4bd1536bd2a
Shuo Qian [Wed, 20 Feb 2019 01:22:07 +0000 (17:22 -0800)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
am:
9102b10a00
Change-Id: I91088e4dda584b102409f4007b25f405d538464f
TreeHugger Robot [Wed, 20 Feb 2019 01:19:16 +0000 (01:19 +0000)]
Merge "Fix flaky TaskStackChangedListenerTest"
Hall Liu [Wed, 20 Feb 2019 01:08:04 +0000 (01:08 +0000)]
Merge "Turn on enforcing mode for Q-based location APIs"
Shuo Qian [Wed, 20 Feb 2019 01:08:03 +0000 (01:08 +0000)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
Malcolm Chen [Thu, 31 Jan 2019 05:19:57 +0000 (21:19 -0800)]
Move getPhoneCount implementation back to TelephonyManager.
Moving it inside iTelephony creates problems. Some components call
getPhoneCount during initialization while iTelephony service is not
even running, which will cause phone process to crash.
Bug:
123667461
Test: manual
Change-Id: I51199eaf0bd87055c21fe61af50f4c353137d621
Merged-In: I51199eaf0bd87055c21fe61af50f4c353137d621
Matthew Ng [Sat, 16 Feb 2019 00:20:31 +0000 (16:20 -0800)]
Added visual affordance/handle for navigation bar
Added the handle that would sit at the bottom where the navigation bar
would be and off by default. Use prototype to make it visible. The bar
will also use color adaptation. Needed to fix null states when the
inflator would swap the normal home/back button layout with the handle.
Added the new 16dp overlay as the visual inset.
Test: manual
Bug:
112934365
Change-Id: I88f3443ad36ceefa8f490d17b4daefbeaab5c60a
jovanak [Mon, 18 Feb 2019 09:00:43 +0000 (01:00 -0800)]
For automotive builds: makes sure the keyguard gets automatically
dismissed after every user switch.
Fixes:
123765081
Test: Manual verification of keyguard dismissal after boot and many user switches.
Change-Id: Ie72ad254a41057df7efc79bda97b64f7dc5a980e
John Reck [Wed, 20 Feb 2019 00:20:01 +0000 (00:20 +0000)]
Merge "Fix RenderThread setForLooper"
sqian [Thu, 14 Feb 2019 22:58:03 +0000 (14:58 -0800)]
Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel
Test: Treehugger
Bug:
123999640
Change-Id: Ie68a02a7e0f9aabe5dbc37806a495169feb63765
Merged-In: Ie68a02a7e0f9aabe5dbc37806a495169feb63765
(cherry picked from commit
0c86fbf491f4781ef3be68ba51aa3bfdb0bd7bc0)
TreeHugger Robot [Tue, 19 Feb 2019 23:19:56 +0000 (23:19 +0000)]
Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel"
Vishnu Nair [Tue, 19 Feb 2019 23:06:30 +0000 (15:06 -0800)]
[automerger skipped] Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev am:
5a50cb42b7
am:
eef39badae -s ours
am skip reason: subject contains skip directive
Change-Id: I7ad95ea52af6ddf1a30d6eeecc6b91d1826f3df3
Nataniel Borges [Tue, 19 Feb 2019 23:02:56 +0000 (15:02 -0800)]
[automerger skipped] Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys" am:
b829ad7b17 -s ours am:
45233be2cb -s ours
am:
11631e7fa9 -s ours
am skip reason: subject contains skip directive
Change-Id: I74742bab1a9ee14eeae93ad449a6ee74a904e7e5
Vishnu Nair [Tue, 19 Feb 2019 22:56:36 +0000 (14:56 -0800)]
Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev
am:
5a50cb42b7
Change-Id: I60169422c51d12b19bb24e997ec9a2a98fffa2ea
Hongwei Wang [Wed, 6 Feb 2019 22:43:39 +0000 (14:43 -0800)]
Adds android.media.HwAudioSource class
The new HwAudioSource (inherits PlayerBase) serves as a player backed by
a hardware audio source device.
Sample usage
```
HwAudioSource player = new HwAudioSource.Builder()
.setAudioDeviceInfo(deviceInfo)
.setAudioAttributes(new AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA)
.build())
.build();
player.start();
```
Bug:
112161027
Test: Launch FM Tuner application
Change-Id: Id1f49c88cbbdb2b9156137ed8920713aa29b2d1c
Raman Tenneti [Tue, 19 Feb 2019 22:49:23 +0000 (14:49 -0800)]
[automerger skipped] Merge "Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev" into stage-aosp-master am:
bfddb8cce7 -s ours
am:
e5e06bf25c -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: Id192d6b87a663a2e5d609c412342299300dc1376
TreeHugger Robot [Tue, 19 Feb 2019 22:45:16 +0000 (22:45 +0000)]
Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev
Nataniel Borges [Tue, 19 Feb 2019 22:44:39 +0000 (14:44 -0800)]
[automerger skipped] Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys" am:
b829ad7b17 -s ours
am:
45233be2cb -s ours
am skip reason: subject contains skip directive
Change-Id: Id9ac53e323c1439bbd38746a03e4e00aaf4232bf
Bill Yi [Tue, 19 Feb 2019 22:40:06 +0000 (14:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I01b16b7e400b569350aad675ab5f75bd28dac24c
Nataniel Borges [Tue, 19 Feb 2019 22:36:36 +0000 (14:36 -0800)]
[automerger skipped] Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys"
am:
b829ad7b17 -s ours
am skip reason: subject contains skip directive
Change-Id: I71edd61462c4f7b276a207d7efca6a5f82bb0a3e
Raman Tenneti [Tue, 19 Feb 2019 22:29:21 +0000 (14:29 -0800)]
[automerger skipped] Merge "Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev" into stage-aosp-master
am:
bfddb8cce7 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1
95bd7221f6 is in history
Change-Id: Ib8ae69eb4c74e0bb29639424218d405a598a5ae8
Treehugger Robot [Tue, 19 Feb 2019 22:21:05 +0000 (22:21 +0000)]
Merge "[DO NOT MERGE] Support trace command on Window Manager dumpsys"
TreeHugger Robot [Tue, 19 Feb 2019 22:13:43 +0000 (22:13 +0000)]
Merge "Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev" into stage-aosp-master
Bill Yi [Tue, 19 Feb 2019 22:05:27 +0000 (14:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ieee5c947030f588c5f8a8a153e2c42661342d60f
Android Build Merger (Role) [Tue, 19 Feb 2019 22:04:14 +0000 (22:04 +0000)]
Merge "[automerger skipped] Merge "Lazely initialize AccountManager debug table." am:
18cccec624 am:
90aea59364 am:
c60f62f7ba -s ours am skip reason: change_id I2af9074e50bddc5a1d18ea781cc6f56934f21302 with SHA1
4744319f08 is in history"
Dmitry Dementyev [Tue, 19 Feb 2019 22:03:32 +0000 (14:03 -0800)]
[automerger skipped] Merge "Lazely initialize AccountManager debug table." am:
18cccec624 am:
90aea59364
am:
c60f62f7ba -s ours
am skip reason: change_id I2af9074e50bddc5a1d18ea781cc6f56934f21302 with SHA1
4744319f08 is in history
Change-Id: I2190049c3f6c6e8d0d20e111304a0a6216a2fbed
Winson Chiu [Tue, 19 Feb 2019 22:02:07 +0000 (22:02 +0000)]
Merge "idmap2: add signature policy"
Bill Yi [Tue, 19 Feb 2019 21:31:17 +0000 (13:31 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idb5d5034ebd53ffc67f8628b74be7a53f58aa7d3
Dmitry Dementyev [Tue, 19 Feb 2019 21:02:10 +0000 (13:02 -0800)]
Merge "Lazely initialize AccountManager debug table." am:
18cccec624
am:
90aea59364
Change-Id: Ic08bc5f91ef153ddd28533a638ccca33cd408553
Bill Yi [Tue, 19 Feb 2019 20:56:46 +0000 (12:56 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6743c980549e1620354ea082664333e8612c28e0
Dmitry Dementyev [Tue, 19 Feb 2019 20:23:26 +0000 (12:23 -0800)]
Merge "Lazely initialize AccountManager debug table."
am:
18cccec624
Change-Id: If7e12145dfa8e104777956bdab9a743f3f860e24
Jeff Sharkey [Tue, 19 Feb 2019 20:23:05 +0000 (20:23 +0000)]
Merge "Map MediaStore items to StorageVolume."
Bill Yi [Tue, 19 Feb 2019 20:07:54 +0000 (12:07 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I16612db31b21037fb7f56d8b34d84df0c7e37cf1
Dmitry Dementyev [Tue, 19 Feb 2019 19:49:13 +0000 (19:49 +0000)]
Merge "Lazely initialize AccountManager debug table."
Bill Yi [Tue, 19 Feb 2019 19:32:44 +0000 (11:32 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ieb2802240cd7e1f91014579d3367d9f6bf2d152c
Christopher Tate [Sat, 16 Feb 2019 00:48:22 +0000 (16:48 -0800)]
Don't attempt to work on empty pending starts list
Also plug a bookkeeping hole where information about pending service
starts was cleared but delayed starts relying on that information were
accidentally left dangling.
Fixes:
124467582
Fixes:
124399808
Test: apct/device_boot_health_check_extra
Change-Id: Ic1fec244c76be0969860fd5abee31be575ce0eca
Raman Tenneti [Wed, 6 Feb 2019 00:34:43 +0000 (16:34 -0800)]
Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
On 9/28 CL https://googleplex-android-review.git.corp.google.com/
5116913 was checked into pi-dev. Merge was bad(couple of lines were lost during merge).
https://b.corp.google.com/issues/
35655737#comment34
Adding LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS and LOCK_SCREEN_SHOW_NOTIFICATIONS to SETTINGS_TO_BACKUP array. This fixes apct/framework/presubmit test failure.
Bug:
35655737
Bug:
118674794
Test: presubmit unit tests
Change-Id: I2e9cc95e8827e72ef3c09910d4d3e089bde375e5
Merged-In: I421c7487955ee339f88e3957c973375d0f87e2ff
(cherry picked from commit
33a11bd0e3c29937af311bc55bbbe36ee63608f4)
Aaron Heuckroth [Tue, 19 Feb 2019 19:25:33 +0000 (19:25 +0000)]
Merge "Add support for small screens to grid-based global actions menu."
Tarandeep Singh [Tue, 19 Feb 2019 19:23:04 +0000 (19:23 +0000)]
Merge "Override checkInputConnectionProxy in SearchView."
Ned Burns [Fri, 15 Feb 2019 23:08:39 +0000 (18:08 -0500)]
Remove doInflateSynchronous() from InflationCallback
Trying to simplify this callback in preparation for streamlining
the inflation pipeline. This method only exists to enable some tests;
changed it to be a field and/or param in appropriate places.
Test: atest
Change-Id: I6e630fab5ba168d5accb57b403f9b5b0a224dff1
Yiwei Zhang [Tue, 19 Feb 2019 19:03:05 +0000 (19:03 +0000)]
Merge "Game Driver: Add a Settings.Global property for sphal libraries"
Sasha Smundak [Tue, 19 Feb 2019 18:57:08 +0000 (10:57 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
a81d64e940 am:
efa1d26538
am:
8e0d9d8473
Change-Id: Ic6d75ff8e072f9f3eb6ca472bea0122ac220075a
Sasha Smundak [Tue, 19 Feb 2019 18:46:30 +0000 (10:46 -0800)]
Merge "Convert Android.mk file to Android.bp" am:
a81d64e940
am:
efa1d26538
Change-Id: I8e82717e35d5d569a2a91fb609726537733d1aba
John Reck [Tue, 19 Feb 2019 18:38:50 +0000 (10:38 -0800)]
Fix RenderThread setForLooper
RenderThread doesn't use ThreadBase::threadLoop
so it also needs to explicitly Looper::setForLooper
Fixes:
124467483
Test: hwuiunit
Change-Id: I3703b5d3dbbbaa68e88fc23756dfccacfce863cb
Mark Renouf [Tue, 19 Feb 2019 18:33:38 +0000 (18:33 +0000)]
Merge "Forward StatusBar.onBackPressed to Bubbles when expanded"
Sasha Smundak [Tue, 19 Feb 2019 18:32:16 +0000 (10:32 -0800)]
Merge "Convert Android.mk file to Android.bp"
am:
a81d64e940
Change-Id: I8202195e94c616d8b09e76aa01f4d74f098afd3e
Beverly [Tue, 19 Feb 2019 18:24:45 +0000 (10:24 -0800)]
[automerger skipped] Merge "Update keyguard charging text to indicate wireless" into pi-dev am:
06cfb175bd
am:
0a928f8903 -s ours
am skip reason: change_id I9cce8ecaf07f8870164d9ef8a569fcf30db69d85 with SHA1
7d7f699f4a is in history
Change-Id: I70aba4c5c7412548c2e94bcb4f6f3b5a8d59a696
Bill Yi [Tue, 19 Feb 2019 18:23:58 +0000 (10:23 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0286c19387a614103c795956a2f6b4e672ff4133
Treehugger Robot [Tue, 19 Feb 2019 18:18:40 +0000 (18:18 +0000)]
Merge "Convert Android.mk file to Android.bp"
Beverly [Tue, 19 Feb 2019 18:16:32 +0000 (10:16 -0800)]
Merge "Update keyguard charging text to indicate wireless" into pi-dev
am:
06cfb175bd
Change-Id: Ia474165d912c2090f4756108124c8a0333b31e6b
Christian Wailes [Tue, 19 Feb 2019 18:15:48 +0000 (18:15 +0000)]
Merge "Add blastula pool system properties"
Ryan Mitchell [Tue, 19 Feb 2019 18:09:56 +0000 (18:09 +0000)]
Merge "Fix seg faul when parsing invalid <plurals>"
TreeHugger Robot [Tue, 19 Feb 2019 18:02:30 +0000 (18:02 +0000)]
Merge "Update keyguard charging text to indicate wireless" into pi-dev
OSDN Git Service
