OSDN Git Service
Selim Cinek [Tue, 6 Feb 2018 23:24:25 +0000 (15:24 -0800)]
Fixed an issue where we would access the wrong drawable
Quick follow up fix the inline images
Test: add notification with image
Change-Id: I21c149b0cd63bc93895eee34be5e68d3caef0298
Selim Cinek [Fri, 26 Jan 2018 21:36:43 +0000 (13:36 -0800)]
Implemented support for inline images
Messaging Style always had API support to
display images, but they were never shown.
We are now displaying images inline
Bug:
63708826
Test: send messages with an image
Change-Id: I50c835b19f4846cb2cbfb17e9805eacffd9ec6b3
Selim Cinek [Mon, 29 Jan 2018 20:40:32 +0000 (12:40 -0800)]
Added a timeout to the launch animation
After the timeout was hit, we stop blocking touches.
Bug:
69168591
Test: launch notification from service
Change-Id: I6bbb0d603631164cefdbadf0eb9d92af0aaeb84e
Ruchi Kandoi [Sat, 27 Jan 2018 02:08:38 +0000 (02:08 +0000)]
Merge "Add UID and Service for Secure Element Application" am:
b8b7589531 am:
8ee3204c58
am:
2b894394a5 -s ours
Change-Id: Ic0681499e0690883dedecaa2e80269f1412d8e94
Ruchi Kandoi [Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)]
Merge "Add UID and Service for Secure Element Application" am:
b8b7589531
am:
8ee3204c58
Change-Id: I7c74f21e014fb7eb772e2d86cc278fd774ffb8c9
Ruchi Kandoi [Sat, 27 Jan 2018 01:52:33 +0000 (01:52 +0000)]
Merge "Add UID and Service for Secure Element Application"
am:
b8b7589531
Change-Id: Ib66be1532dd440b1161e6d2d727243fc6b9e614f
TreeHugger Robot [Sat, 27 Jan 2018 01:47:05 +0000 (01:47 +0000)]
Merge "Delay coming out of doze until keyguard dismissed"
TreeHugger Robot [Sat, 27 Jan 2018 01:29:43 +0000 (01:29 +0000)]
Merge "Tweak and rename new ease curve"
TreeHugger Robot [Sat, 27 Jan 2018 01:18:20 +0000 (01:18 +0000)]
Merge "Proto enums for DeviceIdleMode"
TreeHugger Robot [Sat, 27 Jan 2018 01:10:27 +0000 (01:10 +0000)]
Merge "Enable wifi wake for all P devices."
Jack Yu [Sat, 27 Jan 2018 01:08:33 +0000 (01:08 +0000)]
Merge "Renamed Result to ResultCode" am:
093ab1dc61 am:
ce29c3ecbd
am:
40045aee45
Change-Id: Idaf26a3cb64871637e10f84fe492a7d5bd706e46
Jack Yu [Sat, 27 Jan 2018 00:59:45 +0000 (00:59 +0000)]
Merge "Renamed Result to ResultCode" am:
093ab1dc61
am:
ce29c3ecbd
Change-Id: I7c3b24d7ced5b2b7f468a03c2caf85f66e881301
Treehugger Robot [Sat, 27 Jan 2018 00:53:00 +0000 (00:53 +0000)]
Merge "Add UID and Service for Secure Element Application"
Jack Yu [Sat, 27 Jan 2018 00:52:06 +0000 (00:52 +0000)]
Merge "Renamed Result to ResultCode"
am:
093ab1dc61
Change-Id: I1dda97b48a3f5068fc001478b88190406f03d109
Ruchi Kandoi [Thu, 4 Jan 2018 00:14:57 +0000 (16:14 -0800)]
Add UID and Service for Secure Element Application
Bug:
64994044
Test: Boot; Check Service loaded.
Change-Id: I2f48ff204acd29b1a9f6819910aba5f8f3762977
Treehugger Robot [Sat, 27 Jan 2018 00:39:37 +0000 (00:39 +0000)]
Merge "Renamed Result to ResultCode"
Dmitry Dementyev [Sat, 27 Jan 2018 00:37:53 +0000 (00:37 +0000)]
Merge "Rename RecoveryController.getRecoveryData() to getKeyChainSnapshot."
Etan Cohen [Sat, 27 Jan 2018 00:36:50 +0000 (00:36 +0000)]
Merge "Update SmallTest library"
Makoto Onuki [Sat, 27 Jan 2018 00:31:42 +0000 (00:31 +0000)]
Merge "Allow system jobs to be exempted from app-standby"
Dmitry Dementyev [Sat, 27 Jan 2018 00:26:47 +0000 (00:26 +0000)]
Merge "Recreate recovery snapshot with current version if it is not stored."
Android Build Merger (Role) [Sat, 27 Jan 2018 00:26:13 +0000 (00:26 +0000)]
Merge "Merge "Support Background Service Limitations." am:
a0f863d4fb am:
b747134254 am:
7f0e5de1a3"
Dmitry Dementyev [Sat, 27 Jan 2018 00:25:58 +0000 (00:25 +0000)]
Merge "Remove platform key when user disables lock screen protection"
hirotaka motegi [Sat, 27 Jan 2018 00:25:51 +0000 (00:25 +0000)]
Merge "Support Background Service Limitations." am:
a0f863d4fb am:
b747134254
am:
7f0e5de1a3
Change-Id: Ie5cc9948a7538a8fedcf645a9d419fb74cc9bc3b
hirotaka motegi [Sat, 27 Jan 2018 00:13:47 +0000 (00:13 +0000)]
Merge "Support Background Service Limitations." am:
a0f863d4fb
am:
b747134254
Change-Id: I14259c8d36028440323f940e212c9099a62a6c87
Pavlin Radoslavov [Sat, 27 Jan 2018 00:11:53 +0000 (00:11 +0000)]
Merge "Add support for Multi-A2DP state machines per device" am:
bb5318df8a am:
adf2239562
am:
bc2e4a230b -s ours
Change-Id: Iae0f6c59f152c391f319de580d3f9a0ac19be31a
TreeHugger Robot [Sat, 27 Jan 2018 00:04:27 +0000 (00:04 +0000)]
Merge "Prevent 2nd action down motionevent on nav bar press"
TreeHugger Robot [Sat, 27 Jan 2018 00:01:42 +0000 (00:01 +0000)]
Merge "Adding privacy tags for ps dump."
Pavlin Radoslavov [Sat, 27 Jan 2018 00:01:20 +0000 (00:01 +0000)]
Merge "Add support for Multi-A2DP state machines per device" am:
bb5318df8a
am:
adf2239562
Change-Id: Ibe372b2ecda317e7970d6e681a4e2330e69782c1
TreeHugger Robot [Fri, 26 Jan 2018 23:59:25 +0000 (23:59 +0000)]
Merge "Add setting/experiment for time only mode for watch type devices."
hirotaka motegi [Fri, 26 Jan 2018 23:57:58 +0000 (23:57 +0000)]
Merge "Support Background Service Limitations."
am:
a0f863d4fb
Change-Id: I9adaa11f83492d5e09d19ded088deb7119bcdade
Pavlin Radoslavov [Fri, 26 Jan 2018 23:53:17 +0000 (23:53 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
am:
bb5318df8a
Change-Id: I9fabffc6d7fdb3cb001b685618532f10000dd4ac
TreeHugger Robot [Fri, 26 Jan 2018 23:44:42 +0000 (23:44 +0000)]
Merge "Remove workaround for the ByteBuffer#put issue"
TreeHugger Robot [Fri, 26 Jan 2018 23:44:23 +0000 (23:44 +0000)]
Merge "Add conscrypt, okhttp, bouncycastle to the classpath when building stubs"
Treehugger Robot [Fri, 26 Jan 2018 23:36:21 +0000 (23:36 +0000)]
Merge "Support Background Service Limitations."
Howard Ro [Fri, 26 Jan 2018 23:25:42 +0000 (23:25 +0000)]
Merge "Prevent writeDataToDisk calls when switching from guest user to primary user"
Android Build Merger (Role) [Fri, 26 Jan 2018 23:10:15 +0000 (23:10 +0000)]
Merge "Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am:
3151e86aa8 am:
b51d583e32 am:
a6d7e270af -s ours"
Steven Moreland [Fri, 26 Jan 2018 23:09:15 +0000 (23:09 +0000)]
Merge changes from topic "hidl-system-api"
* changes:
Add remaining missing HIDL SystemApi methods.
HIDL: reportSyspropMethod -> enableInstrumentation
Pavlin Radoslavov [Fri, 26 Jan 2018 23:08:56 +0000 (23:08 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am:
3151e86aa8 am:
b51d583e32
am:
a6d7e270af -s ours
Change-Id: I81430ac8e91ede366ca151ced8b9eb1cccaa87be
Pavlin Radoslavov [Fri, 26 Jan 2018 23:00:34 +0000 (23:00 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am:
3151e86aa8
am:
b51d583e32
Change-Id: I80fe36452b078b25f52eef6f22acdb20e06c10f5
Pavlin Radoslavov [Fri, 26 Jan 2018 22:53:02 +0000 (22:53 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
am:
3151e86aa8
Change-Id: I1f1e62dde014fe4b0a2d3e93aeea0f305232bc01
Etan Cohen [Tue, 23 Jan 2018 15:10:01 +0000 (07:10 -0800)]
Update SmallTest library
android.test.suitebuilder.annotation.SmallTest is deprecated and
replaced by android.support.test.filters.SmallTest.
Update all test files. No other change.
Bug:
72324160
Test: all unit tests pass
Change-Id: I02ec8419a3eac698077d46b0b95f1f695b0f1b9b
Treehugger Robot [Fri, 26 Jan 2018 22:43:53 +0000 (22:43 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
TreeHugger Robot [Fri, 26 Jan 2018 22:35:07 +0000 (22:35 +0000)]
Merge changes Iac1c21ce,I2329432a
* changes:
Add relevant SysUI values to notch emulation packages
Move QS height values to frameworks/base/core/res/
Android Build Merger (Role) [Fri, 26 Jan 2018 22:14:43 +0000 (22:14 +0000)]
Merge "Merge "Added slot id in the internal API" am:
045ff781b9 am:
5674b8e119 am:
da1f3a566a"
Jack Yu [Fri, 26 Jan 2018 22:14:21 +0000 (22:14 +0000)]
Merge "Added slot id in the internal API" am:
045ff781b9 am:
5674b8e119
am:
da1f3a566a
Change-Id: I74871fd9c3630192efcce5bae68c2b34aeed7d45
TreeHugger Robot [Fri, 26 Jan 2018 22:12:26 +0000 (22:12 +0000)]
Merge "Proto enum reference for App Transitions"
Makoto Onuki [Fri, 26 Jan 2018 22:10:03 +0000 (14:10 -0800)]
Allow system jobs to be exempted from app-standby
This flag will allow the sync manager to exempt certain kind of sync requests.
- This will only exempt jobs from app-standby.
- EBS still won't exempt them. Battery saver cuts background network anyway, so
background syncs will still not work, and it didn't used to work pre-P either.
- Manual force-app standby still doesn't allow them to run.
Bug:
72443754
Test: Build and boot. The behavior shouldn't change since none uses the flag yet.
Test: atest CtsJobSchedulerTestCases
Change-Id: I806b97bb4b7da773479e878e6eccb792b03eadc1
Matthew Ng [Thu, 25 Jan 2018 01:01:08 +0000 (17:01 -0800)]
Prevent 2nd action down motionevent on nav bar press
Since motions events are proxied to launcher on intercept and on touch,
when user touches it used to send both. Prevent the action down proxy
event onTouchEvent will only send one touch event if nothing else
handles it.
Bug:
67957962
Test: manual
Change-Id: Ia2a6bfe6cd963f9383a1468f5ba64dc28005a394
TreeHugger Robot [Fri, 26 Jan 2018 22:07:21 +0000 (22:07 +0000)]
Merge "incidentd: Adding privacy tag and expanding field."
Jack Yu [Fri, 26 Jan 2018 22:06:17 +0000 (22:06 +0000)]
Merge "Added slot id in the internal API" am:
045ff781b9
am:
5674b8e119
Change-Id: I12f2a0e8d75e593ac046368ee94d1f8d183d6ded
Jack Yu [Fri, 26 Jan 2018 21:59:33 +0000 (21:59 +0000)]
Merge "Added slot id in the internal API"
am:
045ff781b9
Change-Id: I4222766dbd47c731b1612f9d4405375a7b4dd499
TreeHugger Robot [Fri, 26 Jan 2018 21:58:29 +0000 (21:58 +0000)]
Merge "v3 APK verification: reset por signedData after verification."
Bill Yi [Fri, 26 Jan 2018 21:29:22 +0000 (21:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
c95d9b29e2 -s ours
am:
6331bfd209 -s ours
Change-Id: I23147707ca5e2349d9a86a1e8042d14b1495ec9d
Bill Yi [Fri, 26 Jan 2018 21:27:49 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
4b7b89b9a1 -s ours
am:
9be01e0258 -s ours
Change-Id: I63bad0555c9ab4959e2fb073597de93d7477f0e8
Bill Yi [Fri, 26 Jan 2018 21:23:31 +0000 (21:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
a2c154e0cd -s ours
am:
da312d3a44 -s ours
Change-Id: Ic6a6339f1fa5f79b355785947d4796f56e6df8e5
Bill Yi [Fri, 26 Jan 2018 21:21:55 +0000 (21:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
497bbfd9ac -s ours
am:
6ab6643d3e -s ours
Change-Id: I18094c4478691bb3709222a945b304b0c9dc73fb
Bill Yi [Fri, 26 Jan 2018 21:20:37 +0000 (21:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
28abd94074 -s ours
am:
130f1a6b5e -s ours
Change-Id: I2a87a73363d9e665db8616e320a08e487187a487
Bill Yi [Fri, 26 Jan 2018 21:18:18 +0000 (21:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c95d9b29e2 -s ours
Change-Id: Id188e8eb53b6b3e9d0c468b550fc5ae4ad602289
Bill Yi [Fri, 26 Jan 2018 21:15:34 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
4b7b89b9a1 -s ours
Change-Id: I57dae4e6dda7c007c9571d415b3e3e0aa332a753
Bill Yi [Fri, 26 Jan 2018 21:13:17 +0000 (21:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
a2c154e0cd -s ours
Change-Id: Ic092382ce5846801335c5d23aa105bb372a044e4
Bill Yi [Fri, 26 Jan 2018 21:10:39 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
497bbfd9ac -s ours
Change-Id: I27a8de5dc0a587e0df6e6569f7703733c5d222fe
Bill Yi [Fri, 26 Jan 2018 21:10:23 +0000 (21:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
178e861e6e -s ours
am:
eeb9fba09d -s ours
Change-Id: I0724912d370c2b7d157440d029673d0525b5b292
Bill Yi [Fri, 26 Jan 2018 21:08:08 +0000 (21:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
9531d0fd0b -s ours
am:
0a56ce8d2f -s ours
Change-Id: I5f64bda490f2f99f51f7f1e5714314d51e2e1d26
Pavlin Radoslavov [Thu, 4 Jan 2018 03:38:39 +0000 (19:38 -0800)]
Add support for Multi-A2DP state machines per device
* Update usage of A2dpService API calls that take BluetoothDevice
as an additional argument
* Update the description for BluetoothA2dp.connect()
Exempt-From-Owner-Approval: De-facto owner of the relevant changes is
the Bluetooth team.
Bug:
69269748
Test: Manual
Change-Id: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
Merged-In: I190ed48ef65bbc8b88b45f84ebd6ab3d21cf0b4e
(cherry picked from commit
502af2192c6d291174efa434a70101f302a5bd97)
Bill Yi [Fri, 26 Jan 2018 21:05:30 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
28abd94074 -s ours
Change-Id: I94d247f60e399547e4418859a014d2c48ac35674
Bill Yi [Fri, 26 Jan 2018 21:02:47 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
178e861e6e -s ours
Change-Id: I44734403eba503fe12eb094e11998d01e6ebf084
Bill Yi [Fri, 26 Jan 2018 20:59:57 +0000 (20:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9531d0fd0b -s ours
Change-Id: I74d6220a3ec75c941b31cb4bef960dc21aa4bade
TreeHugger Robot [Fri, 26 Jan 2018 20:54:50 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:46 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:41 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:54:03 +0000 (20:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:52:07 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:37 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:33 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Philip P. Moltmann [Fri, 26 Jan 2018 20:49:08 +0000 (20:49 +0000)]
Merge "Add logging to MemoryIntArray"
Treehugger Robot [Fri, 26 Jan 2018 20:46:45 +0000 (20:46 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
Sudheer Shanka [Fri, 26 Jan 2018 20:13:16 +0000 (20:13 +0000)]
Merge "Fix tests due to missing FLAG_START_NEW_TASK."
Amith Yamasani [Fri, 19 Jan 2018 18:58:07 +0000 (10:58 -0800)]
Delay coming out of doze until keyguard dismissed
Don't come out of doze when screen is on, but
wait until the keyguard is dismissed as well.
Pass along the keyguard dismissed to DeviceIdle
Request exitIdle when notifications are clicked.
Bug:
63527576
Test: Manual:
Turn off screen
adb shell dumpsys battery unplug
adb shell dumpsys deviceidle step x4
Turn on screen, verify still in doze
Unlock, verify out of doze
Automatic: TBD
Change-Id: Ibe2edd564e3aebbe1dbaa4077950dd9d3940eeae
Dmitry Dementyev [Fri, 26 Jan 2018 19:49:34 +0000 (11:49 -0800)]
Rename RecoveryController.getRecoveryData() to getKeyChainSnapshot.
Bug:
72299798
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I1a530414d255867786142fa2e01e50469379e295
TreeHugger Robot [Fri, 26 Jan 2018 19:55:28 +0000 (19:55 +0000)]
Merge "Get the themes outside of the resource lock"
David Brazdil [Fri, 26 Jan 2018 19:51:11 +0000 (19:51 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder" am:
656096516c am:
47f632d48f
am:
43f511a928
Change-Id: Ibf3581193d88df1916b1c2d57c94d01095cdac97
David Brazdil [Fri, 26 Jan 2018 19:39:20 +0000 (19:39 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder" am:
656096516c
am:
47f632d48f
Change-Id: I99148ade6a6fafe63618312c228fbe6372e3b401
Primiano Tucci [Fri, 26 Jan 2018 19:38:21 +0000 (19:38 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd" am:
a946cc9f53 am:
71411b877a
am:
8552eb769c -s ours
Change-Id: Ia73b8d86b9291d9bad2163637832aa387262cc57
Primiano Tucci [Fri, 26 Jan 2018 19:29:31 +0000 (19:29 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd" am:
a946cc9f53
am:
71411b877a
Change-Id: I8c07b8650a508f03352075ac7bd6e7943f6cacb4
Dmitry Dementyev [Fri, 26 Jan 2018 18:54:52 +0000 (10:54 -0800)]
Recreate recovery snapshot with current version if it is not stored.
Use Builder to create Parcelables.
Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ieed92be627a8a2411353ce6a84b26dd7bde99401
Jack Yu [Fri, 26 Jan 2018 19:25:13 +0000 (19:25 +0000)]
Merge "Added slot id in the internal API"
David Brazdil [Fri, 26 Jan 2018 19:24:35 +0000 (19:24 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"
am:
656096516c
Change-Id: Icfda85f4f80516d6f4141be7ede7d047df6aeecf
Primiano Tucci [Fri, 26 Jan 2018 19:18:24 +0000 (19:18 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"
am:
a946cc9f53
Change-Id: Ie7a7071264cb91d26eb380b3155a5ed71667fb46
TreeHugger Robot [Fri, 26 Jan 2018 19:13:36 +0000 (19:13 +0000)]
Merge "[QS] Update hotspot secondary label transient text"
Pavlin Radoslavov [Sun, 21 Jan 2018 10:59:15 +0000 (02:59 -0800)]
Add Settings support for Bluetooth Multi-A2DP and Multi-HFP
When there are multiple connected A2DP/HFP devices, if a connected
device's name is clicked on, that device will be chosen as
Active - i.e., it will be the device chosen for audio out / phone call.
Also:
* Listen to the BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED
and BluetoothHeadset.ACTION_ACTIVE_DEVICE_CHANGED intents
and update the the status of the current active device.
* When connecting a new device, and Multi-A2DP is enabled, don't
disconnect the currently connected device.
* Update the implementation of isA2dpPlaying() so it correctly checks
all connected devices, not only the first one.
Test: Manual: multiple connected A2DP devices, and selecting each as
the Active Device.
Bug:
64767509
Change-Id: I69f3c85ebf5a7f07f6deed484c6dd65705460ae4
Merged-In: I69f3c85ebf5a7f07f6deed484c6dd65705460ae4
(cherry picked from commit
1af33a192614bb490701ab2e8e21866690b3b4fa)
Ruchi Kandoi [Thu, 4 Jan 2018 00:14:57 +0000 (16:14 -0800)]
Add UID and Service for Secure Element Application
Bug:
64994044
Test: Boot; Check Service loaded.
Merged-In: I2f48ff204acd29b1a9f6819910aba5f8f3762977
Change-Id: I2f48ff204acd29b1a9f6819910aba5f8f3762977
(cherry picked from commit
dfaf4bdd1e7e12caf9bb69c8facc38e879861baf)
Chad Brubaker [Fri, 26 Jan 2018 19:01:24 +0000 (19:01 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev am:
7ebe5f0ba1
am:
c8f0e0dab9
Change-Id: I37e08077152850e290b71cf9ceadbff374dd4183
Chad Brubaker [Fri, 26 Jan 2018 18:52:47 +0000 (18:52 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
am:
7ebe5f0ba1
Change-Id: I39d11196229806e4f1fdb171623d8cd94b1d3fbf
Android Build Merger (Role) [Fri, 26 Jan 2018 18:44:23 +0000 (18:44 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
c358d2b6dc -s ours am:
c241610486 -s ours"
Ben Gruver [Fri, 26 Jan 2018 18:44:11 +0000 (18:44 +0000)]
Merge "Implement UI for warn-on-launch"
Bill Yi [Fri, 26 Jan 2018 18:43:51 +0000 (18:43 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
c358d2b6dc -s ours
am:
c241610486 -s ours
Change-Id: I0cbf79f18bb0edfb1b28220b7cc3f810e1682bb5
TreeHugger Robot [Fri, 26 Jan 2018 18:40:16 +0000 (18:40 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 18:39:18 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c358d2b6dc -s ours
Change-Id: I99e0718b5e031415d04140d76176f569b9576e04
TreeHugger Robot [Fri, 26 Jan 2018 18:28:20 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Chris Tate [Fri, 26 Jan 2018 18:21:04 +0000 (18:21 +0000)]
Merge "Let the job scheduler know when the user interacts with an app"
OSDN Git Service
