OSDN Git Service
TreeHugger Robot [Sat, 16 Mar 2019 02:01:01 +0000 (02:01 +0000)]
Merge "Fallback to legacy intent factory when the template is null"
Patrick Huang [Sat, 16 Mar 2019 01:45:23 +0000 (01:45 +0000)]
Merge "Document permissions for euicc privileged actions."
TreeHugger Robot [Sat, 16 Mar 2019 01:43:43 +0000 (01:43 +0000)]
Merge "Adjust how force-dark is enabled"
TreeHugger Robot [Sat, 16 Mar 2019 01:31:13 +0000 (01:31 +0000)]
Merge "AudioService: fix death linking for external audio policy"
TreeHugger Robot [Sat, 16 Mar 2019 00:57:55 +0000 (00:57 +0000)]
Merge "Do not ignore runID in SRTTrack"
TreeHugger Robot [Sat, 16 Mar 2019 00:25:27 +0000 (00:25 +0000)]
Merge "Full bucket should be reset even when the last bucket is invalid."
Tyler Gunn [Sat, 16 Mar 2019 00:18:40 +0000 (17:18 -0700)]
Merge "Cleanup unsupported appusage in Telecom apis." am:
90723afa47 am:
545bace60f
am:
77b1dfa56a
Change-Id: I54a446eaf8c22149f6df5c2f677eb8b5072deda6
TreeHugger Robot [Sat, 16 Mar 2019 00:11:17 +0000 (00:11 +0000)]
Merge "MediaPlayer: fix use after free for mMediaTimeProvider"
Tyler Gunn [Sat, 16 Mar 2019 00:09:27 +0000 (17:09 -0700)]
Merge "Cleanup unsupported appusage in Telecom apis." am:
90723afa47
am:
545bace60f
Change-Id: If429c8987bdda6ade37364cc116ff0fcd01315a2
Nikita Ioffe [Sat, 16 Mar 2019 00:07:27 +0000 (00:07 +0000)]
Merge "Properly fail commit of a new staged session if another one is in progress"
Jack Yu [Fri, 15 Mar 2019 23:53:51 +0000 (16:53 -0700)]
[automerger skipped] Merge "Moved transport to IntDef" am:
b7463a63d1 am:
f713c1ff26
am:
bc8cc99b20 -s ours
am skip reason: change_id I1b513bcaaa0ebf47c14593d962579ed48a7c6db0 with SHA1
ef25faf013 is in history
Change-Id: Iae5ff42920f769ecfc9de290f513bd926e4de77b
Tyler Gunn [Fri, 15 Mar 2019 23:51:04 +0000 (16:51 -0700)]
Merge "Cleanup unsupported appusage in Telecom apis."
am:
90723afa47
Change-Id: If983c7a0351138fcfb35d9060b0c17c7b9e2c69f
Sasha Smundak [Fri, 15 Mar 2019 23:41:01 +0000 (16:41 -0700)]
Merge "Convert Android.mk file to Android.bp" am:
504a33a64e am:
c35c355dbb
am:
c78d2ff15f
Change-Id: I88fe73e11421204c4f0b2e20b91088cf91bdaa13
Jack Yu [Fri, 15 Mar 2019 23:40:23 +0000 (16:40 -0700)]
Merge "Moved transport to IntDef" am:
b7463a63d1
am:
f713c1ff26
Change-Id: I9a68e86efd37018db87dfb09af58fba8b99c3b15
Tyler Gunn [Fri, 15 Mar 2019 23:36:21 +0000 (23:36 +0000)]
Merge "Cleanup unsupported appusage in Telecom apis."
Android Build Merger (Role) [Fri, 15 Mar 2019 23:34:36 +0000 (23:34 +0000)]
Merge "Merge "[API feedback] api fixed for getSlotMapping" am:
9931252c3f am:
58fed7fac6 am:
91ae15122f"
Pengquan Meng [Fri, 15 Mar 2019 23:34:10 +0000 (16:34 -0700)]
Merge "[API feedback] api fixed for getSlotMapping" am:
9931252c3f am:
58fed7fac6
am:
91ae15122f
Change-Id: I08c80e60a89ab359c83e4043a1dfb74c92dc0b8a
TreeHugger Robot [Fri, 15 Mar 2019 23:31:59 +0000 (23:31 +0000)]
Merge "Fix typo in jstring signature definition"
Jack Yu [Fri, 15 Mar 2019 23:31:06 +0000 (16:31 -0700)]
Merge "Moved transport to IntDef"
am:
b7463a63d1
Change-Id: I80d2bf5b3d195d4b05135006418ba4b638271f4f
TreeHugger Robot [Fri, 15 Mar 2019 23:27:35 +0000 (23:27 +0000)]
Merge "Revert "Always suppress font error during resource loading""
Robert Shih [Fri, 15 Mar 2019 23:25:49 +0000 (23:25 +0000)]
Merge "MediaDrm: [Security,Hdcp]Level @deprecated javadoc"
TreeHugger Robot [Fri, 15 Mar 2019 23:23:25 +0000 (23:23 +0000)]
Merge "Add annotation for EuiccManager#updateSubscriptionNickname."
Treehugger Robot [Fri, 15 Mar 2019 23:21:29 +0000 (23:21 +0000)]
Merge "Moved transport to IntDef"
Yuanjia Hsu [Fri, 15 Mar 2019 23:16:02 +0000 (23:16 +0000)]
Merge "Temporarily pre-grant permission with STOPSHIP"
Sasha Smundak [Fri, 15 Mar 2019 23:16:01 +0000 (16:16 -0700)]
Merge "Convert Android.mk file to Android.bp" am:
504a33a64e
am:
c35c355dbb
Change-Id: I07ed85ddb9d9da89f09c2d403ef1edec6912307f
Pengquan Meng [Fri, 15 Mar 2019 23:08:01 +0000 (16:08 -0700)]
Merge "[API feedback] api fixed for getSlotMapping" am:
9931252c3f
am:
58fed7fac6
Change-Id: I858a9014859f6c44862165cc7a970bdc20176fe4
Sasha Smundak [Fri, 15 Mar 2019 23:02:49 +0000 (16:02 -0700)]
Merge "Convert Android.mk file to Android.bp"
am:
504a33a64e
Change-Id: I464c162ef26998c2c1c968e9da36b35fa36eabb1
Pengquan Meng [Fri, 15 Mar 2019 22:58:45 +0000 (15:58 -0700)]
Merge "[API feedback] api fixed for getSlotMapping"
am:
9931252c3f
Change-Id: I68489daa92188232f3d1489226f71c14d5b2b14d
Patrick Huang [Fri, 15 Mar 2019 02:25:47 +0000 (19:25 -0700)]
Document permissions for euicc privileged actions.
Bug:
128317064
Test: Test on phone
Change-Id: I285597e48e97f1b4ffe4b4eb4ac68010905f4e1f
Treehugger Robot [Fri, 15 Mar 2019 22:49:30 +0000 (22:49 +0000)]
Merge "Convert Android.mk file to Android.bp"
Pengquan Meng [Fri, 15 Mar 2019 22:38:46 +0000 (22:38 +0000)]
Merge "[API feedback] api fixed for getSlotMapping"
Jean-Michel Trivi [Wed, 13 Mar 2019 22:44:25 +0000 (15:44 -0700)]
AudioService: fix death linking for external audio policy
When using an external focus policy, link to death of focus
requester (death handler was created, but not activated).
Fix error code path with external focus policy: on error at
request, do not use the legacy code path, abort instead.
Bug:
128541285
Test: see bug
Change-Id: I4b118308eb0b5b2220eaeb822c2302b941119f9b
Dariusz Budner [Fri, 15 Jan 2016 18:29:03 +0000 (19:29 +0100)]
Do not ignore runID in SRTTrack
Set mRunID parameter when adding cue to the list because of
mRunID value depends if past cues are removed from the list
during active cues update. Keeping past cues on the list makes
it possible to find and set proper active cue after seeking
backward.
Bug:
68034458
Test: play video with srt subtitle and seek
Change-Id: I8439840d5925607127fadc1082913d9d91f688af
Olivier Gaillard [Fri, 15 Mar 2019 17:33:40 +0000 (17:33 +0000)]
Full bucket should be reset even when the last bucket is invalid.
If the bucket is not reset, we will sum the data from the previous
bucket and the next bucket.
As well, the value should only be added to the full bucket if the value
is set.
Bug:
128521677
Test: atest statsd_test
Change-Id: I45bf924a5d2966044cecda34fff84b7cbfe070b0
John Reck [Fri, 15 Mar 2019 21:23:19 +0000 (14:23 -0700)]
Adjust how force-dark is enabled
Move it off of a pure targetSdkVersion check and instead
to an opt-in based off of theme.
Bug:
128683634
Test: force dark tests
Change-Id: I95095a246f3482110b71cd63742db8b955516e50
Jack Yu [Fri, 15 Mar 2019 21:16:42 +0000 (21:16 +0000)]
Merge "Moved transport to IntDef"
Seigo Nonaka [Fri, 15 Mar 2019 21:07:44 +0000 (21:07 +0000)]
Revert "Always suppress font error during resource loading"
This reverts commit
96e93959fb8cb27db1829b28113558cc8136c858.
Reason for revert:
This breaks CTS. Looks like even in old devices, we tells errors to
developers. Just suppression is not a right solution here.
Change-Id: Ia1b1916d94d115174afe8e822fc669b37e5f3937
Robert Shih [Fri, 15 Mar 2019 20:59:06 +0000 (13:59 -0700)]
MediaDrm: [Security,Hdcp]Level @deprecated javadoc
Bug:
127625289
Test: build
Change-Id: I1d5559eb8e46f7df7952daca09fdd0c0a55dc114
Yu-Han Yang [Fri, 15 Mar 2019 21:00:02 +0000 (14:00 -0700)]
Fix typo in jstring signature definition
Bug:
127464982
Test: tested on cuttlefish
Change-Id: Ifa48055e270d4b4b76b12de549db99b44e7dd426
Sooraj Sasindran [Fri, 15 Mar 2019 20:57:53 +0000 (13:57 -0700)]
[automerger skipped] Merge changes from topic "Porting-ONSAPIChanges" am:
31c7607ee6 am:
f6b0d994a7
am:
acf23ad83e -s ours
am skip reason: change_id I5df2311d91fdab34563148b4466163696e52faf9 with SHA1
6315e59275 is in history
Change-Id: If69b52328c406f702d4bcc73463f259240f537e8
Sooraj Sasindran [Fri, 15 Mar 2019 20:50:37 +0000 (13:50 -0700)]
[automerger skipped] Provide network bands in AvailableNetworkInfo am:
c9948da02a am:
3e08825d4c
am:
5984d59e47 -s ours
am skip reason: change_id I0d0a180eb4da3edf50a94ba621505ad95c7a262c with SHA1
40e6f909ef is in history
Change-Id: Ic33212f8f6d9b26e14913b52edb679ef21932535
Sooraj Sasindran [Fri, 15 Mar 2019 20:18:47 +0000 (13:18 -0700)]
Merge changes from topic "Porting-ONSAPIChanges" am:
31c7607ee6
am:
f6b0d994a7
Change-Id: Idf128d17a2fac096ca5e28000648638c1d70fff2
Sooraj Sasindran [Fri, 15 Mar 2019 20:13:26 +0000 (13:13 -0700)]
Provide network bands in AvailableNetworkInfo am:
c9948da02a
am:
3e08825d4c
Change-Id: Ibdfb3a26f2aea6d4c53a157b9045a9f3dca09176
Sooraj Sasindran [Fri, 15 Mar 2019 19:53:18 +0000 (12:53 -0700)]
Merge changes from topic "Porting-ONSAPIChanges"
am:
31c7607ee6
Change-Id: Ibca8c0202ff702be57f128b0cc24a8679d0a8083
Sooraj Sasindran [Fri, 15 Mar 2019 19:46:05 +0000 (12:46 -0700)]
Provide network bands in AvailableNetworkInfo
am:
c9948da02a
Change-Id: Ib7ba8c29f8e8ed7237b5afcccf9d1694596f1263
Fan Zhang [Fri, 15 Mar 2019 19:41:20 +0000 (12:41 -0700)]
Merge "Update feature flag mapping owners" am:
16eab7c16d am:
6d52af0b55
am:
1e932cf89c
Change-Id: I12118dae5a391e762176b5b09c590d30786bec3b
Shuo Qian [Fri, 15 Mar 2019 19:33:17 +0000 (19:33 +0000)]
Merge "Emergency Number format"
Sooraj Sasindran [Fri, 15 Mar 2019 19:31:55 +0000 (19:31 +0000)]
Merge changes from topic "Porting-ONSAPIChanges"
* changes:
Should not turn on validation for data
Provide network bands in AvailableNetworkInfo
Fan Zhang [Fri, 15 Mar 2019 19:31:45 +0000 (12:31 -0700)]
Merge "Update feature flag mapping owners" am:
16eab7c16d
am:
6d52af0b55
Change-Id: Id0249ae47337c5dca7c60cab580f4e1be4159486
Fan Zhang [Fri, 15 Mar 2019 19:22:29 +0000 (12:22 -0700)]
Merge "Update feature flag mapping owners"
am:
16eab7c16d
Change-Id: I2b51778fc7ed71066d95968bfef6053659945e8c
Fan Zhang [Fri, 15 Mar 2019 19:12:37 +0000 (19:12 +0000)]
Merge "Update feature flag mapping owners"
Wei Jia [Fri, 15 Mar 2019 18:34:15 +0000 (11:34 -0700)]
MediaPlayer: fix use after free for mMediaTimeProvider
Test: cts
Bug:
128327073
Change-Id: I4c9a9e3bfe27d6ec3d533a4ef8c5706d32221eed
Tony Mak [Fri, 1 Mar 2019 16:44:17 +0000 (16:44 +0000)]
Fallback to legacy intent factory when the template is null
When RemoteActionTemplate[] is null, it means the intent generator
is not working, we then fallback to legacy intent factory
If RemoteActionTemplate[] is an empty array, it means the intent
generator is run, but no intent is generated.
Also, moved all intent related class to intent/ folder
Test: atest frameworks/base/core/tests/coretests/src/android/view/textclassifier/
Change-Id: I7e4c49dc3ebed4d498ac26f0894d7af85419419e
TreeHugger Robot [Fri, 15 Mar 2019 18:22:15 +0000 (18:22 +0000)]
Merge "Maintain existing train information"
Benedict Wong [Fri, 15 Mar 2019 18:13:04 +0000 (11:13 -0700)]
[automerger skipped] Merge "Integrate testNetworkService and Manager with Connectivity stack" am:
b86c3255fd am:
016ac0a953
am:
e942aafb0a -s ours
am skip reason: change_id I741ef9cdf4bd4125d9129af3a030edf32f438e4f with SHA1
99a4841954 is in history
Change-Id: Ic64ea5abdc07034b674c1365de7af75abd94d119
Benedict Wong [Fri, 15 Mar 2019 17:59:21 +0000 (10:59 -0700)]
Merge "Integrate testNetworkService and Manager with Connectivity stack" am:
b86c3255fd
am:
016ac0a953
Change-Id: If9efbc3e0b3f0949286a2a5ad8226009ebbcfc07
Benedict Wong [Fri, 15 Mar 2019 17:50:06 +0000 (10:50 -0700)]
Merge "Integrate testNetworkService and Manager with Connectivity stack"
am:
b86c3255fd
Change-Id: I571e583d896841c814efe58b8c0875fa9cd3873c
Benedict Wong [Fri, 15 Mar 2019 17:41:02 +0000 (17:41 +0000)]
Merge "Integrate testNetworkService and Manager with Connectivity stack"
Adam He [Fri, 15 Mar 2019 17:12:47 +0000 (17:12 +0000)]
Merge "Push buffer with TEXT_CHANGE_TIMEOUT from device_config_text_change_flush_frequency if text_change event received."
Cody Kesting [Fri, 15 Mar 2019 16:40:27 +0000 (09:40 -0700)]
Merge "Fix ServiceState.hashCode() bug." am:
466ff7b990 am:
842fd65fe4
am:
11d091f9da
Change-Id: Idab8b65c1b71d25c71db12928d363e9e28b4f662
Cody Kesting [Fri, 15 Mar 2019 16:25:22 +0000 (09:25 -0700)]
Merge "Fix ServiceState.hashCode() bug." am:
466ff7b990
am:
842fd65fe4
Change-Id: I968a368b97d74bb8f228df38cb8c0700ccb9b4b4
TreeHugger Robot [Fri, 15 Mar 2019 16:15:41 +0000 (16:15 +0000)]
Merge "Rename setPowerSaverMode to setPowerSaverModeEnabled"
Cody Kesting [Fri, 15 Mar 2019 16:11:09 +0000 (09:11 -0700)]
Merge "Fix ServiceState.hashCode() bug."
am:
466ff7b990
Change-Id: I9705b0857ecc5f9a809e7e640fbc35151d244211
Zak Cohen [Fri, 15 Mar 2019 16:09:39 +0000 (16:09 +0000)]
Merge "ContentSuggestionsManager - API updates."
TreeHugger Robot [Fri, 15 Mar 2019 15:58:03 +0000 (15:58 +0000)]
Merge "MediaDrm: @Deprecate SecurityLevel & HdcpLevel"
Rubin Xu [Fri, 15 Mar 2019 15:55:59 +0000 (15:55 +0000)]
Merge "Add metric logging for new delegated APIs"
Cody Kesting [Fri, 15 Mar 2019 15:46:30 +0000 (15:46 +0000)]
Merge "Fix ServiceState.hashCode() bug."
Cody Kesting [Thu, 14 Mar 2019 17:35:23 +0000 (10:35 -0700)]
Fix ServiceState.hashCode() bug.
ServiceState currently overrides hashCode() incorrectly. It hashes an
Array field without using Arrays.hashCode(), meaning that the default
Object.hashCode() implementation is used (which is based on the address
of the Array field). This allows equivalent ServiceState instances to
produce different hashes.
Bug:
128609620
Test: atest CtsTelephonyTestCases:ServiceStateTest
Change-Id: I40a7d0b7ebab6d2a1be47ea63a6d223c4c13700b
Leon Scroggins [Fri, 15 Mar 2019 15:17:23 +0000 (15:17 +0000)]
Merge "Revert "Speculative fix for createBitmap crash""
Nikita Ioffe [Thu, 14 Mar 2019 18:40:17 +0000 (18:40 +0000)]
Properly fail commit of a new staged session if another one is in progress
Previous implementation did not really work because:
* PackageInstallerSession.commit marks session as committed and then
sends MSG_COMMIT message;
* handleCommit calls StagingManager#commitSession;
This means that by the time StagingManager#commitSession(session) is called:
* mStagedSessions already contain session;
* this session is already marked as committed;
As a result, implementation in the ag/
6638240 was failing a second committed
session only if it's id is greater than id of the first one.
Why manual testing in the previous CL worked?
I guess, I got lucky and in my case the second session had a greater id.
Bug:
127296534
Test: atest CtsStagedInstallHostTestCases (run 10 times)
Test: adb install --staged foo.apk (10 times with reboots in between)
Change-Id: I78f22d5537a7d074fc69f146dafccee6a6e5e896
Abhijeet Kaur [Fri, 15 Mar 2019 14:44:30 +0000 (07:44 -0700)]
[automerger skipped] Merge "Bugreport Manager service clear binder identity" am:
1f6b8f50c1 am:
32538e15a3
am:
86fe59adba -s ours
am skip reason: change_id Ida781b633efbea57a9442fb9a8a5f823f9acbe8b with SHA1
cc56417a80 is in history
Change-Id: I6719230e97c99c022e0f5f968e04449c0ac473fe
Abhijeet Kaur [Fri, 15 Mar 2019 14:35:12 +0000 (07:35 -0700)]
Merge "Bugreport Manager service clear binder identity" am:
1f6b8f50c1
am:
32538e15a3
Change-Id: I50615918e195f60790ff6f9cadf2cfc063a682f8
Abhijeet Kaur [Fri, 15 Mar 2019 14:26:06 +0000 (07:26 -0700)]
Merge "Bugreport Manager service clear binder identity"
am:
1f6b8f50c1
Change-Id: Idc5d92ca9be7d20f57dcd6a376b96ed12cc382fc
Treehugger Robot [Fri, 15 Mar 2019 14:13:43 +0000 (14:13 +0000)]
Merge "Bugreport Manager service clear binder identity"
Stanislav Zholnin [Fri, 15 Mar 2019 14:01:20 +0000 (14:01 +0000)]
Merge "Add WRITE_DEVICE_CONFIG permission check to DeviceConfig API."
Ruslan Tkhakokhov [Fri, 15 Mar 2019 13:47:03 +0000 (13:47 +0000)]
Merge "Fix runtime restart: at com.android.server.backup.restore.FullRestoreEngine"
TreeHugger Robot [Fri, 15 Mar 2019 13:41:32 +0000 (13:41 +0000)]
Merge "Make a copy of data stored in LockSettingsStorage cache"
Ricky Wai [Fri, 15 Mar 2019 12:31:06 +0000 (12:31 +0000)]
Merge "Change get/setAppDetailsActivityEnabled to get/setSyntheticAppDetailsActivityEnabled"
Leon Scroggins [Fri, 15 Mar 2019 12:14:20 +0000 (12:14 +0000)]
Merge changes I241824bf,I9021864f
* changes:
Convert ColorLong in native code in Paint
Restore Paint#nSetColor(@ColorInt)
Rubin Xu [Fri, 15 Mar 2019 11:38:36 +0000 (11:38 +0000)]
Make a copy of data stored in LockSettingsStorage cache
In general the cache should store copies of the original data
to prevent the caller from accidentally corrupting the cache after
the data is cached. This wasn't an issue until recently when
LockSettingsService starts to aggressively zeroize buffers,
which caused some unit test failures.
Bug:
120484642
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
Change-Id: I8cc61789f19613cca8ed36ca34aa42fe6b2ad674
Ruslan Tkhakokhov [Fri, 8 Mar 2019 12:17:49 +0000 (12:17 +0000)]
Fix runtime restart: at com.android.server.backup.restore.FullRestoreEngine
When a full backup operation times out, resources are cleaned up
including closing and nullifying pipes. However FullRestoreEngine.restoreOneFile()
doesn't stop execution and can access the pipes causing RuntimeException.
This CL adds a flag to show whether the operation has timed out and
checks it before accessing the pipes.
Bug:
126244736
Test: 1) atest RunBackupFrameworksServicesRoboTests
2) atest CtsBackupTestCases
3) atest CtsBackupHostTestCases
4) atest GtsBackupTestCases
5) atest GtsBackupHostTestCases
6) Manual: Test full backup/restore flow using Flipboard app
Change-Id: If400142a6fceaa4065409774bbff1cad8b4c6163
Nandana Dutt [Fri, 15 Mar 2019 10:56:27 +0000 (03:56 -0700)]
Merge changes I39e84219,I8d0e12cb am:
cae221acac am:
20324711c0
am:
8ea4083e36
Change-Id: I4521a62ce5cd461efd9c936bd5f630f653e48809
Nandana Dutt [Fri, 15 Mar 2019 10:47:20 +0000 (03:47 -0700)]
Merge changes I39e84219,I8d0e12cb am:
cae221acac
am:
20324711c0
Change-Id: I6d345de879380cd2797008efa79e3befa978f136
Nandana Dutt [Fri, 15 Mar 2019 10:39:51 +0000 (03:39 -0700)]
Merge changes I39e84219,I8d0e12cb
am:
cae221acac
Change-Id: I5fe14b5b25a1b22e184aa02e658c81d9d0238541
TreeHugger Robot [Fri, 15 Mar 2019 10:33:07 +0000 (10:33 +0000)]
Merge "Add PackageInstaller CTS tests to test mapping."
Treehugger Robot [Fri, 15 Mar 2019 10:28:06 +0000 (10:28 +0000)]
Merge changes I39e84219,I8d0e12cb
* changes:
Bugreporting API: Take ownership of fds.
Don't manage dumpstate lifecycle from system server
TreeHugger Robot [Fri, 15 Mar 2019 09:05:33 +0000 (09:05 +0000)]
Merge "Fix IME is beyond the screen if the app doesn't fill its parent bounds"
Junyu Lai [Fri, 15 Mar 2019 08:19:55 +0000 (01:19 -0700)]
Merge "[KA02.5] Use binder thread and executor to invoke callback" am:
f9ae70a41c am:
1ed9d716fc
am:
d3b8a5c332
Change-Id: I881c1ab09187ab23facc03bb71cc38a7978e442c
Junyu Lai [Fri, 15 Mar 2019 08:10:46 +0000 (01:10 -0700)]
Merge "[KA02.5] Use binder thread and executor to invoke callback" am:
f9ae70a41c
am:
1ed9d716fc
Change-Id: I259ff770ce491d9dec5d136202bebf08e6de58e2
Junyu Lai [Fri, 15 Mar 2019 07:53:55 +0000 (00:53 -0700)]
Merge "[KA02.5] Use binder thread and executor to invoke callback"
am:
f9ae70a41c
Change-Id: I892d4f4dc786aa42dcbe565f345e9a731f318c8a
Junyu Lai [Fri, 15 Mar 2019 07:35:27 +0000 (07:35 +0000)]
Merge "[KA02.5] Use binder thread and executor to invoke callback"
TreeHugger Robot [Fri, 15 Mar 2019 07:26:46 +0000 (07:26 +0000)]
Merge "Revert "Make Paint default to filtering Bitmaps""
Jonathan Nguyen [Fri, 15 Mar 2019 03:44:52 +0000 (20:44 -0700)]
Maintain existing train information
When sendBinaryPushStateChangedAtom is called with empty train
name/version/experiment ids, populate the empty fields from the
trainInfo previously stored on disk if possible.
If no train info is on disk (or read fails), the empty fields are passed
through.
Test: gts in ag/
6731864
Test: testdrive 10051 with partially/completely missing train info
Bug:
128640419
Change-Id: Iea3c2db5c11d07f0b42b41aec7b2d7913a99ca03
TreeHugger Robot [Fri, 15 Mar 2019 07:02:23 +0000 (07:02 +0000)]
Merge "Let scanning progress loop"
TreeHugger Robot [Fri, 15 Mar 2019 05:45:39 +0000 (05:45 +0000)]
Merge "Make Location settings use user sensitive"
Riddle Hsu [Thu, 14 Mar 2019 08:54:26 +0000 (16:54 +0800)]
Fix IME is beyond the screen if the app doesn't fill its parent bounds
An activity with fixed aspect ratio may not cover the entire screen.
Once the left of the app surface is not the same as the left display
dock frame, the IME will be beyond the screen.
Bug:
128581369
Test: atest DisplayContentTests#testComputeImeParent_app_notMatchParentBounds
Test: manual - Launch a landscape activity with fixed aspect ratio 1.2.
Click the input field in the activity and check the IME position.
Change-Id: If4125a18042e45efae1f8115008b0374b2669084
Android Build Merger (Role) [Fri, 15 Mar 2019 04:25:01 +0000 (04:25 +0000)]
Merge "[automerger skipped] Merge "Remove SMSDispatcher.sendData() from greylist as it's params changed" am:
fe86a00845 am:
c911bc365e am:
910c491792 -s ours am skip reason: change_id Ib70dd739d8067ca2e37f0dbc6c48a2d625935a4b with SHA1
cd0d609f75 is in history"
Kevin Chyn [Fri, 15 Mar 2019 04:24:29 +0000 (04:24 +0000)]
Merge "Don't check canUseBiometric if caller is system process"
Amit Mahajan [Fri, 15 Mar 2019 04:23:40 +0000 (21:23 -0700)]
[automerger skipped] Merge "Remove SMSDispatcher.sendData() from greylist as it's params changed" am:
fe86a00845 am:
c911bc365e
am:
910c491792 -s ours
am skip reason: change_id Ib70dd739d8067ca2e37f0dbc6c48a2d625935a4b with SHA1
cd0d609f75 is in history
Change-Id: I16182565661ae5144c1635a617799d0eefaf5dca
Roger Wang [Fri, 15 Mar 2019 04:13:51 +0000 (04:13 +0000)]
Revert "Make Paint default to filtering Bitmaps"
This reverts commit
1a732211990d88549e0ee18afc087f068d22069e.
Reason for revert: cts failure, b/
128641982
Change-Id: If27a39d8d4f6cc03c642b63be1a32af187ce8758