OSDN Git Service
Steven Wu [Tue, 12 Mar 2019 17:49:23 +0000 (13:49 -0400)]
Add logging for doze trigger reasons.
Bug:
127827561
Test: manual
Change-Id: I1cc87a104db783a190fc36884a560de1f89c6b56
Steven Wu [Mon, 11 Mar 2019 21:14:11 +0000 (17:14 -0400)]
Add logging for keyguard authentication.
Bug:
127824940
Test: manual
Change-Id: Ib2ff6f6ac9f8c26fb875dc12c81f97939416a538
TreeHugger Robot [Mon, 11 Mar 2019 18:54:35 +0000 (18:54 +0000)]
Merge "Reset assistant role after package force stop."
TreeHugger Robot [Mon, 11 Mar 2019 18:53:50 +0000 (18:53 +0000)]
Merge "Remove onSmsKillSwitchToggled() from system API."
Shuo Qian [Mon, 11 Mar 2019 18:39:35 +0000 (18:39 +0000)]
Merge "Emergency API review"
Brad Ebinger [Mon, 11 Mar 2019 18:20:49 +0000 (18:20 +0000)]
Merge "Correct default Dialer role config"
Chalard Jean [Mon, 11 Mar 2019 18:00:43 +0000 (11:00 -0700)]
[automerger skipped] Merge "Add tethering event callback API" am:
5227285ad7 am:
b14afc3a5f
am:
6018db93d7 -s ours
am skip reason: change_id I7ca81b27c9b805cc01884509f5b20d9d0a24cd36 with SHA1
6ea3454f07 is in history
Change-Id: Id6a807ce24b007384caa23385127e7f6e3093e1a
Mingguang Xu [Mon, 11 Mar 2019 17:49:38 +0000 (17:49 +0000)]
Merge "Wifi usability: Add screen status into WifiIsUnusableEvent"
Hui Yu [Mon, 11 Mar 2019 17:37:59 +0000 (17:37 +0000)]
Merge "Add new UsageStats event DEVICE_STARTUP"
Chalard Jean [Mon, 11 Mar 2019 17:36:15 +0000 (10:36 -0700)]
Merge "Add tethering event callback API" am:
5227285ad7
am:
b14afc3a5f
Change-Id: I083910feb7abf3f554fd2b8dddbc13a7aed8e27c
TreeHugger Robot [Mon, 11 Mar 2019 17:30:49 +0000 (17:30 +0000)]
Merge "Remove Global Actions Panel top margin."
Chalard Jean [Mon, 11 Mar 2019 17:26:28 +0000 (10:26 -0700)]
Merge "Add tethering event callback API"
am:
5227285ad7
Change-Id: Ie38a521abf09e0eb530173508b14aa2acdb9267c
TreeHugger Robot [Mon, 11 Mar 2019 17:26:00 +0000 (17:26 +0000)]
Merge "Revert "Fix NotificationManagerServiceTest to properly use DeviceConfig API with shell permission""
TreeHugger Robot [Mon, 11 Mar 2019 17:24:51 +0000 (17:24 +0000)]
Merge "Unhide methods required for Parcelable class"
Jack Yu [Sun, 10 Mar 2019 19:45:52 +0000 (12:45 -0700)]
Unhide methods required for Parcelable class
Those methods were already public in the base class.
Test: Build
FIXES:
126702898
Change-Id: Ibce8f9bf5d1a3ebf9225fa46422dc3c78e29b1f6
TreeHugger Robot [Mon, 11 Mar 2019 17:22:40 +0000 (17:22 +0000)]
Merge "Use a boolean Consumer instead of RoleManagerCallback."
TreeHugger Robot [Mon, 11 Mar 2019 17:20:48 +0000 (17:20 +0000)]
Merge "Fixed Settings.ACTION_REQUEST_ENABLE_CONTENT_CAPTURE javadoc"
Chalard Jean [Mon, 11 Mar 2019 17:04:57 +0000 (17:04 +0000)]
Merge "Add tethering event callback API"
Lucas Dupin [Mon, 11 Mar 2019 17:03:05 +0000 (17:03 +0000)]
Merge "Only try to auth if there's a notification"
Lucas Dupin [Mon, 11 Mar 2019 16:56:53 +0000 (16:56 +0000)]
Merge "StatusBarWindowViewTest should run with a Looper"
Xin Li [Mon, 11 Mar 2019 16:51:35 +0000 (09:51 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master am:
286062e5ce -s ours
am:
29036b9fe0 -s ours
am skip reason: subject contains skip directive
Change-Id: I4a5a6f8ec9c9030097a4db77a683f8420e5f213c
Tao Bao [Mon, 11 Mar 2019 16:46:31 +0000 (16:46 +0000)]
Merge "Add Javadoc for UpdateEngine constants."
Xin Li [Mon, 11 Mar 2019 16:40:19 +0000 (09:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
am:
286062e5ce -s ours
am skip reason: subject contains skip directive
Change-Id: I0fe69052a7643f692471752d2dd88556f2d61326
The Android Open Source Project [Mon, 11 Mar 2019 16:33:58 +0000 (09:33 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master am:
53f7682117 -s ours
am:
605a406be2 -s ours
am skip reason: subject contains skip directive
Change-Id: I1318164b00addc83fdf82e9d9c5dd722cf9e09a3
The Android Open Source Project [Mon, 11 Mar 2019 16:21:09 +0000 (09:21 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
am:
53f7682117 -s ours
am skip reason: subject contains skip directive
Change-Id: I724c9dd2852cf947a99254763b60eb3db99246ad
Xin Li [Mon, 11 Mar 2019 16:09:43 +0000 (16:09 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
TreeHugger Robot [Mon, 11 Mar 2019 16:00:22 +0000 (16:00 +0000)]
Merge "Remove conversation id in ConversationActions"
TreeHugger Robot [Mon, 11 Mar 2019 15:38:09 +0000 (15:38 +0000)]
Merge changes from topic "idmap-default-policies"
* changes:
Fix idmap scan to supply correct policies
Revert "Revert "Enforce a default policy on packages without <overlayable>""
Chalard Jean [Mon, 11 Mar 2019 15:23:42 +0000 (08:23 -0700)]
Merge "Add a static to get the Ip Memory Store" am:
bee0cbe5df am:
9f1414dac1
am:
771628aba9
Change-Id: I11e66200c4491eba9449a519f43ba89b51b9526e
Chalard Jean [Mon, 11 Mar 2019 15:14:03 +0000 (08:14 -0700)]
Merge "Add a static to get the Ip Memory Store" am:
bee0cbe5df
am:
9f1414dac1
Change-Id: Ibcd5e3cfb34262b69661329878f27587eaf84180
Etan Cohen [Mon, 11 Mar 2019 15:10:35 +0000 (15:10 +0000)]
Merge "[AWARE] Add annotations to ParcelablePeerHandle"
Chalard Jean [Mon, 11 Mar 2019 15:04:48 +0000 (08:04 -0700)]
Merge "Add a static to get the Ip Memory Store"
am:
bee0cbe5df
Change-Id: I8cf868ca1801f30a772fea7716e0b9fd322a80de
Treehugger Robot [Mon, 11 Mar 2019 14:56:34 +0000 (14:56 +0000)]
Merge "Add a static to get the Ip Memory Store"
Julia Reynolds [Mon, 11 Mar 2019 14:55:18 +0000 (14:55 +0000)]
Revert "Fix NotificationManagerServiceTest to properly use DeviceConfig API with shell permission"
This reverts commit
a686b9310cc5f09ded5f0b68d1950a23f062a649.
Reason for revert: breaks all the tests
Change-Id: I800de434b6b4ecf0c132fb36025ab800ebe28b0f
Tyler Gunn [Mon, 11 Mar 2019 14:40:28 +0000 (14:40 +0000)]
Merge "Remove TelecomManager#EXTRA_IS_ENABLED."
TreeHugger Robot [Mon, 11 Mar 2019 14:17:28 +0000 (14:17 +0000)]
Merge "WM: Don't skip on parent changed when creating TestAppWindowToken"
TreeHugger Robot [Mon, 11 Mar 2019 14:12:54 +0000 (14:12 +0000)]
Merge "Use updated DeviceConfig API's new getters to simplify invocations."
Nikita Ioffe [Mon, 11 Mar 2019 14:05:14 +0000 (14:05 +0000)]
Merge "Add AppDataRollbackHelperTest to RollbackManager presubmit"
Nikita Ioffe [Mon, 11 Mar 2019 12:08:25 +0000 (12:08 +0000)]
Add AppDataRollbackHelperTest to RollbackManager presubmit
Test: atest --test-mapping frameworks/base/services/core/java/com/android/server/rollback
Bug:
124104119
Fixes:
124104119
Change-Id: I75f8f3a721e3e3221175b700e6e7a15f17422859
Beth Thibodeau [Mon, 11 Mar 2019 14:00:30 +0000 (14:00 +0000)]
Merge "Fix RTL expanded media notification layout"
Abhijeet Kaur [Mon, 11 Mar 2019 13:14:41 +0000 (13:14 +0000)]
Merge "Clean up bugreport API."
TreeHugger Robot [Mon, 11 Mar 2019 13:13:40 +0000 (13:13 +0000)]
Merge "Separate vibration log buffers"
TreeHugger Robot [Mon, 11 Mar 2019 13:05:48 +0000 (13:05 +0000)]
Merge "Allow SmartDark when not in dark mode"
Michael Wright [Mon, 11 Mar 2019 12:51:25 +0000 (12:51 +0000)]
Merge "Allow the light sensor type to be defined per-device."
Derek Sollenberger [Mon, 11 Mar 2019 12:50:13 +0000 (12:50 +0000)]
Merge "Directly manage buffer presentation in Vulkan using AHardwareBuffers."
Stanislav Zholnin [Mon, 11 Mar 2019 12:10:27 +0000 (12:10 +0000)]
Merge "Fix NotificationManagerServiceTest to properly use DeviceConfig API with shell permission identity in preparation to enforcement of permissions through ag/
6055289."
Tony Mak [Tue, 5 Mar 2019 15:48:12 +0000 (15:48 +0000)]
Remove conversation id in ConversationActions
Test: atest cts/./tests/tests/view/src/android/view/textclassifier/cts/ConversationActionsTest.java
BUG:
126434304
Change-Id: I618adaf22a2b897aaaf6600b310ddec581f2aec7
Chalard Jean [Mon, 11 Mar 2019 11:44:24 +0000 (20:44 +0900)]
Add a static to get the Ip Memory Store
This is so that there is some AOSP stable API while the
memory store is moved to the network.
Test: atest FrameworksNetTests
Change-Id: Ib51dbee77fcb0d14a5c85240ac711b3b1aa71286
Shafik Nassar [Mon, 11 Mar 2019 11:44:46 +0000 (11:44 +0000)]
Merge "API cleanup: add NonNull annotation to Rollback API"
Arthur Hung [Tue, 5 Mar 2019 05:58:19 +0000 (13:58 +0800)]
Separate vibration log buffers
The keyboard can blow out our vibration log buffers
pretty quickly since each key has 2 vibrations now.
This break touch feedback/notification/ring vibrations
into their own buffers so we don't lose all of our vibration
data when someone starts typing.
Bug:
118675232
Test: manual
Change-Id: Idae0b6c679d4e3e305ab121ac1b624bed6a4cc8a
Chalard Jean [Mon, 11 Mar 2019 11:40:09 +0000 (04:40 -0700)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am:
af5acad9f1 am:
d378db0b2e
am:
6558544a75
Change-Id: I11a1c8daf0355674ea0d9d4d15c6ee95a18e9cf4
Shafik Nassar [Mon, 11 Mar 2019 11:36:20 +0000 (11:36 +0000)]
Merge "API cleanup: add boolean param to setEnableRollback"
Chalard Jean [Mon, 11 Mar 2019 11:30:54 +0000 (04:30 -0700)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants." am:
af5acad9f1
am:
d378db0b2e
Change-Id: Iee504061c4b61668990489e70d0dd0b75606d24b
Chalard Jean [Mon, 11 Mar 2019 11:21:36 +0000 (04:21 -0700)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."
am:
af5acad9f1
Change-Id: Ib8b991ce89fb94d7f0f8b865a1909f73b0b5be0d
Stanislav Zholnin [Thu, 7 Mar 2019 16:09:20 +0000 (16:09 +0000)]
Use updated DeviceConfig API's new getters to simplify invocations.
Test: atest AssistantSettingsTest
Change-Id: Ia147b184838af0294653947072147f30eb5aece1
Treehugger Robot [Mon, 11 Mar 2019 11:07:21 +0000 (11:07 +0000)]
Merge "[PT17.5] Revert to booleans for send/not send broadcast constants."
Abhijeet Kaur [Fri, 8 Mar 2019 11:00:29 +0000 (11:00 +0000)]
Clean up bugreport API.
Make BugreportManager class final.
Add FloatRange annotation for BugreportManager.onProgress() function's
parameter.
Make @IntDef in BugreportMode hidden.
Bug:
126434607
Test: builds
Change-Id: I95f004106ba97bc9e99859a8b23b96a86b6a43f4
Wu Ahan [Mon, 11 Mar 2019 10:04:13 +0000 (10:04 +0000)]
Merge "Apply a scale animation into the transition between aod and lock screen."
TreeHugger Robot [Mon, 11 Mar 2019 09:58:36 +0000 (09:58 +0000)]
Merge "Add Javadoc"
Olivier Gaillard [Mon, 11 Mar 2019 09:51:18 +0000 (09:51 +0000)]
Merge "Add @Nullable and @NonNull to onTransactStarted"
shafik [Fri, 8 Mar 2019 18:05:59 +0000 (18:05 +0000)]
API cleanup: add boolean param to setEnableRollback
Mark PackageInstaller.SessionParams#setEnableRollback() as @removed and
@deprecated.
Add PackageInstaller.SessionParams#setEnableRollback(enable).
Replace old API usages in RollbackTestUtils with the new API.
Also, add PackageInstaller.SessionInfo#getEnableRollback().
Fixes:
127282838
Test: atest RollbackTest
Change-Id: I696680207be5ac06560d2abb525f91a100301b4c
Chalard Jean [Mon, 15 Oct 2018 05:27:15 +0000 (14:27 +0900)]
[PT17.5] Revert to booleans for send/not send broadcast constants.
In PT17, for security of the patch these two constants have been
switched from boolean to enum values. While this is nice for making
sure a patch is correct, it's also pretty wasteful. Now that it's
certain that the values of these fields don't matter, they can be
set to logical values (as opposed to reversed as it was the case
before PT17.
Test: runtest
Change-Id: I93a0780e23c2f658687be066dc16f27529baaa86
tim peng [Mon, 11 Mar 2019 06:02:41 +0000 (06:02 +0000)]
Merge "Add getConnectableDevices() to read A2DP & HearingAid devices on all states"
Jin Seok Park [Mon, 11 Mar 2019 05:48:08 +0000 (05:48 +0000)]
Merge "[Exif] Throw NPE after checking @NonNull parameters"
Jin Seok Park [Mon, 11 Mar 2019 05:46:08 +0000 (05:46 +0000)]
Merge "[Exif] Prevent infinite loop"
Chalard Jean [Mon, 11 Mar 2019 04:38:18 +0000 (21:38 -0700)]
Merge "Make ParseException less useless." am:
8e8ed1dfc2 am:
55fae4c14c
am:
1f3a202559
Change-Id: I62ef12558f0923d6a4cdbddd5031a2b599a13a6c
Chalard Jean [Mon, 11 Mar 2019 04:29:02 +0000 (21:29 -0700)]
Merge "Make ParseException less useless." am:
8e8ed1dfc2
am:
55fae4c14c
Change-Id: I045520c106529c266f5e06f29bb32cf078df7f8b
TreeHugger Robot [Mon, 11 Mar 2019 04:19:44 +0000 (04:19 +0000)]
Merge "Dispose per-display input channel explicilty when removing display"
Chalard Jean [Mon, 11 Mar 2019 04:19:42 +0000 (21:19 -0700)]
Merge "Make ParseException less useless."
am:
8e8ed1dfc2
Change-Id: If582e61ca92e5414edea351934053fa0ab6b04bf
Treehugger Robot [Mon, 11 Mar 2019 04:06:48 +0000 (04:06 +0000)]
Merge "Make ParseException less useless."
Jin Seok Park [Mon, 11 Mar 2019 02:26:35 +0000 (11:26 +0900)]
Add Javadoc
This CL adds Javadoc for clarifying the relationship between the
framework and AndroidX versions of ExifInterface.
Bug:
122276930
Test: N/A
Change-Id: I096a7322348046662f02b07c98956dad7501a1cf
timhypeng [Wed, 27 Feb 2019 07:01:31 +0000 (15:01 +0800)]
Add getConnectableDevices() to read A2DP & HearingAid devices on all states
Bug:
126475101
Test: make -j50 RunSettingsLibRoboTests
Change-Id: I2d93330efc7b7d381f46462f6d020dbe35a9a57b
Remi NGUYEN VAN [Mon, 11 Mar 2019 02:39:29 +0000 (19:39 -0700)]
Merge changes I9dbbf904,Iebc174ed am:
06d8067975 am:
91b2b0cc60
am:
45a41cf19d
Change-Id: I2e154179065afb9df7731cfbdb641f0d9c7dcdcf
Remi NGUYEN VAN [Mon, 11 Mar 2019 02:30:03 +0000 (19:30 -0700)]
Merge changes I9dbbf904,Iebc174ed am:
06d8067975
am:
91b2b0cc60
Change-Id: I5dc5cc12347755cf48dfedfdd20f50c63dfd30f5
Remi NGUYEN VAN [Mon, 11 Mar 2019 02:22:45 +0000 (19:22 -0700)]
Merge changes I9dbbf904,Iebc174ed
am:
06d8067975
Change-Id: I30176a7bd0992d3a038458c0ccbe3a7ba9ecc9f7
Remi NGUYEN VAN [Mon, 11 Mar 2019 02:06:27 +0000 (02:06 +0000)]
Merge changes I9dbbf904,Iebc174ed
* changes:
Move NetworkStackTests to presubmit
Remove NetworkStack test dependency on testutils
Jin Seok Park [Sat, 9 Mar 2019 09:45:38 +0000 (18:45 +0900)]
[Exif] Prevent infinite loop
This CL fixes the previous implementation which stored the current
position of the file instead of the offset to the next IFD.
Bug:
63800695
Test: Run test file with malformatted thumbnail data
Change-Id: Iab5b9a1a8203e8de1027ecfb887e4f504a27151e
TreeHugger Robot [Mon, 11 Mar 2019 01:32:43 +0000 (01:32 +0000)]
Merge "Correctly evaluating the caller as the non-top activity"
Etan Cohen [Sun, 10 Mar 2019 23:38:19 +0000 (16:38 -0700)]
[AWARE] Add annotations to ParcelablePeerHandle
Add annotations to ParcelablePeerHandle per API council feedback.
Bug:
126375748
Bug:
126701031
Test: atest android.net.wifi.aware
Change-Id: I60471659dd9dd267b10507d5fb5e7639b3c964c2
Jin Seok Park [Sat, 9 Mar 2019 05:14:29 +0000 (14:14 +0900)]
[Exif] Throw NPE after checking @NonNull parameters
Bug:
127896321
Test: Run cts
Change-Id: Ia70bb4d3ce34f151056d2df07a8d8d8e61d07fe3
Sooraj Sasindran [Sun, 10 Mar 2019 05:27:42 +0000 (05:27 +0000)]
Merge "Provide network bands in AvailableNetworkInfo"
TreeHugger Robot [Sun, 10 Mar 2019 04:49:31 +0000 (04:49 +0000)]
Merge "p2p: change wildcard MAC address to 02:00:00:00:00:00"
Jimmy Chen [Sun, 10 Mar 2019 03:45:40 +0000 (03:45 +0000)]
Merge "p2p: add annotation for WifiP2pManager public API"
Sooraj Sasindran [Thu, 7 Mar 2019 23:52:59 +0000 (15:52 -0800)]
Provide network bands in AvailableNetworkInfo
Provide network bands in AvailableNetworkInfo
Test: verified using CTS and make
Bug:
123292899
Change-Id: I0d0a180eb4da3edf50a94ba621505ad95c7a262c
Lucas Dupin [Sat, 9 Mar 2019 23:16:05 +0000 (15:16 -0800)]
Only try to auth if there's a notification
LS sensor isn't a strong signal
Bug:
111414690
Test: manual
Test: atest StatusBarTest
Change-Id: I4c85709e5bb2691644a23260e72687569fc85810
Philip P. Moltmann [Sat, 9 Mar 2019 18:27:26 +0000 (18:27 +0000)]
Merge "Document delayed permission backup mechanism"
andychou [Sat, 9 Mar 2019 16:45:03 +0000 (08:45 -0800)]
[automerger skipped] Merge "resolve merge conflicts of
04d262db157f15c2d822708e57715d80e3f14585 to pi-dev-plus-aosp" into pi-dev-plus-aosp
am:
4048d32e48 -s ours
am skip reason: change_id I2c7feea798df2d9bbfae4ee0847ef151b0d21511 with SHA1
0011121317 is in history
Change-Id: I6a563f965bb0e4aaed05e7196e0a795cb8b38b18
Nicolas Geoffray [Sat, 9 Mar 2019 16:33:42 +0000 (08:33 -0800)]
Merge "Update current API after adding nullable annotations." am:
c06c54662b am:
f99fce01f2
am:
3d1b2b2201
Change-Id: Ic0adb77a52c91d6489797ba5bdb73ea1c020c8bc
Sasha Smundak [Sat, 9 Mar 2019 16:25:50 +0000 (08:25 -0800)]
Merge "Convert tests/**/Android.mk files to Android.bp" am:
40ff4f7d83 am:
c33506ce2f
am:
c15ff15587
Change-Id: I55c5f273e09a2a0ad53fdd8cb4860f04207c4241
Nazanin Bakhshi [Sat, 9 Mar 2019 16:15:15 +0000 (08:15 -0800)]
[automerger skipped] Merge "update getStaticPhoneCapability to use HAL instead of default value" am:
9e6f5d1521 am:
109f4590ca
am:
8a95207b86 -s ours
am skip reason: change_id Ic40921679ade1f9be42f2bc3d5170ba201dbab5a with SHA1
1772247b04 is in history
Change-Id: Ieac24e725bae945aa0023fd72350612d5812c77a
Android Build Merger (Role) [Sat, 9 Mar 2019 15:29:08 +0000 (15:29 +0000)]
Merge "[automerger skipped] Merge "make onActiveDataSubId in PhoneStateListener public API" am:
dfe984c3fe am:
558a5e2632 am:
d7735a130a -s ours am skip reason: change_id I6e5a5c8273348d822b8f552599784b8e986850bf with SHA1
026c42d752 is in history"
Nazanin Bakhshi [Sat, 9 Mar 2019 15:26:24 +0000 (07:26 -0800)]
[automerger skipped] Merge "make onActiveDataSubId in PhoneStateListener public API" am:
dfe984c3fe am:
558a5e2632
am:
d7735a130a -s ours
am skip reason: change_id I6e5a5c8273348d822b8f552599784b8e986850bf with SHA1
026c42d752 is in history
Change-Id: I7050435f330e9da4b41b83db2ef0c2dd5257ed86
Android Build Merger (Role) [Sat, 9 Mar 2019 15:19:55 +0000 (15:19 +0000)]
Merge "[automerger skipped] Merge "Add Keystore get option that supresses caught exceptions warnings." am:
f070b51670 am:
7bf37cf83d am:
27369f9928 -s ours am skip reason: change_id I4bc86e3ea5b11027090fd3a27dc7455557cf66ab with SHA1
4a1cccc938 is in history"
Irina Dumitrescu [Sat, 9 Mar 2019 15:18:38 +0000 (07:18 -0800)]
[automerger skipped] Merge "Add Keystore get option that supresses caught exceptions warnings." am:
f070b51670 am:
7bf37cf83d
am:
27369f9928 -s ours
am skip reason: change_id I4bc86e3ea5b11027090fd3a27dc7455557cf66ab with SHA1
4a1cccc938 is in history
Change-Id: Ic30b5c553c22b9abfa5efd404cca5d82d6abb9a5
Android Build Merger (Role) [Sat, 9 Mar 2019 15:12:52 +0000 (15:12 +0000)]
Merge "Merge "Add TimeStamp Constructor for HAL 1.4 Support" am:
f899e26857 am:
8dada71897 am:
37f2d61ca0"
Nathan Harold [Sat, 9 Mar 2019 15:10:47 +0000 (07:10 -0800)]
Merge "Add TimeStamp Constructor for HAL 1.4 Support" am:
f899e26857 am:
8dada71897
am:
37f2d61ca0
Change-Id: I4e1092538ef72038c2942eb1e4edf2c9b4f514fa
Android Build Merger (Role) [Sat, 9 Mar 2019 15:04:52 +0000 (15:04 +0000)]
Merge "[automerger skipped] Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" am:
016409b3d5 am:
26891a4429 am:
4d2eceffab -s ours am skip reason: change_id Icb90b5bd93845c29157cafddcd53335728638ec2 with SHA1
026451d9fb is in history"
Nazanin Bakhshi [Sat, 9 Mar 2019 15:03:14 +0000 (07:03 -0800)]
[automerger skipped] Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" am:
016409b3d5 am:
26891a4429
am:
4d2eceffab -s ours
am skip reason: change_id Icb90b5bd93845c29157cafddcd53335728638ec2 with SHA1
026451d9fb is in history
Change-Id: I70fdef535e1b58902d908b94254f8f6dfd147acd
Android Build Merger (Role) [Sat, 9 Mar 2019 14:47:31 +0000 (14:47 +0000)]
Merge "[automerger skipped] Merge "Adding KEY_PERMANENTLY_INVALIDATED int" am:
18e0781d3d am:
e6faa759d6 am:
c640787c11 -s ours am skip reason: change_id I878a628824e2eeb639ec5678b1a5d3d10428a918 with SHA1
13f98ce5aa is in history"
Max Bires [Sat, 9 Mar 2019 14:45:40 +0000 (06:45 -0800)]
[automerger skipped] Merge "Adding KEY_PERMANENTLY_INVALIDATED int" am:
18e0781d3d am:
e6faa759d6
am:
c640787c11 -s ours
am skip reason: change_id I878a628824e2eeb639ec5678b1a5d3d10428a918 with SHA1
13f98ce5aa is in history
Change-Id: I28bf552692da1dbb8d42a6283b1560e3e443ff54
OSDN Git Service
