OSDN Git Service
Peng Xu [Tue, 25 Apr 2017 18:01:05 +0000 (18:01 +0000)]
Merge "sensors: fix concurrent modification exception" into oc-dev
am:
9098a0260f
Change-Id: I0f40f8d3bd84f2b070c7d1bd99b46fb4ac08d971
Siyamed Sinir [Tue, 25 Apr 2017 17:56:34 +0000 (17:56 +0000)]
Merge "Update fontchain to read from additional sequences" into oc-dev
am:
a54b89e000
Change-Id: I9247993ea6a8997bff4ac5f978bdf7d32faa99a3
Peng Xu [Tue, 25 Apr 2017 17:51:20 +0000 (17:51 +0000)]
Merge "sensors: fix concurrent modification exception" into oc-dev
Siyamed Sinir [Tue, 25 Apr 2017 17:48:24 +0000 (17:48 +0000)]
Merge "Update fontchain to read from additional sequences" into oc-dev
Jorim Jaggi [Tue, 25 Apr 2017 17:48:00 +0000 (17:48 +0000)]
Merge "Fix some "leaks"" into oc-dev
am:
011e07d7fd
Change-Id: I76b3710a55de02d64865210d6272919f6264d903
Seigo Nonaka [Tue, 25 Apr 2017 17:39:20 +0000 (17:39 +0000)]
Merge "Remove Typeface.create" into oc-dev
am:
0a7096dccb
Change-Id: I2a454b2cafe187d369d7e6faf1f3fe9a0be05f08
Dmitry Dementyev [Tue, 25 Apr 2017 17:34:39 +0000 (17:34 +0000)]
Merge "Update PACKAGE_REMOVED broadcast." into oc-dev
am:
257ba8946e
Change-Id: I9f902dd133d89298220fcc313f5e381113973f4c
TreeHugger Robot [Tue, 25 Apr 2017 17:32:57 +0000 (17:32 +0000)]
Merge "Fix some "leaks"" into oc-dev
Siyamed Sinir [Thu, 20 Apr 2017 01:18:35 +0000 (18:18 -0700)]
Update fontchain to read from additional sequences
Test: make fontchain_lint
Bug:
37520224
Bug:
37169477
Change-Id: Ie01a2aca85314701654cc2397f0bcf8eafdbe608
TreeHugger Robot [Tue, 25 Apr 2017 17:26:58 +0000 (17:26 +0000)]
Merge "Remove Typeface.create" into oc-dev
Phil Weaver [Tue, 25 Apr 2017 17:26:41 +0000 (17:26 +0000)]
Merge "Allow a11y listeners to specify handlers" into oc-dev
am:
efb859f2af
Change-Id: Ifcee49e39f57d5991c15ebf7a2fa4f0fa3a53edf
Dmitry Dementyev [Tue, 25 Apr 2017 17:22:30 +0000 (17:22 +0000)]
Merge "Update PACKAGE_REMOVED broadcast." into oc-dev
Phil Weaver [Tue, 25 Apr 2017 17:17:58 +0000 (17:17 +0000)]
Merge "Allow a11y listeners to specify handlers" into oc-dev
Adrian Roos [Tue, 25 Apr 2017 17:15:38 +0000 (17:15 +0000)]
Merge "Perf: Fix RemoteViews memory leak" into oc-dev
am:
4554332475
Change-Id: I6f61ecea304c12ef965ad1ed2734c45dc4cee91d
Jorim Jaggi [Tue, 25 Apr 2017 17:12:08 +0000 (17:12 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev
am:
f217fc0eff
Change-Id: I81db6d37d9c7a635b33353f0c98790029cb7de14
Adrian Roos [Tue, 25 Apr 2017 17:09:19 +0000 (17:09 +0000)]
Merge "Perf: Fix RemoteViews memory leak" into oc-dev
Jason Monk [Tue, 25 Apr 2017 17:03:59 +0000 (17:03 +0000)]
Merge "Fix crash in plugin settings" into oc-dev
am:
133eb460bd
Change-Id: I60b8fb3a05b46fef7375dd9dddafc5137f0624b0
TreeHugger Robot [Tue, 25 Apr 2017 17:01:42 +0000 (17:01 +0000)]
Merge "Add tracing for onTaskStackChanged" into oc-dev
Pankaj Kanwar [Tue, 25 Apr 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
41f48e3f18 am:
d6465983f1
am:
df2d829272 -s ours
Change-Id: I473b82e8a664634c84ad97e409254addee2b8d60
Jason Monk [Tue, 25 Apr 2017 16:56:32 +0000 (16:56 +0000)]
Merge "Fix crash in plugin settings" into oc-dev
Seigo Nonaka [Thu, 20 Apr 2017 21:27:32 +0000 (14:27 -0700)]
Remove Typeface.create
Test: Manually done
Bug:
37514611
Bug:
37463988
Bug:
37281200
Change-Id: Ida704af910e0ae195b96803de506fa1e1d66c9f5
Antony Sargent [Tue, 25 Apr 2017 16:38:35 +0000 (16:38 +0000)]
Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev
am:
3036e728e7
Change-Id: I409d7902c2dcb20bf5b31c3bc0c4719adcee6596
Antony Sargent [Tue, 25 Apr 2017 16:30:54 +0000 (16:30 +0000)]
Merge "Strings for "Use high quality audio" option in Bluetooth A2DP device settings" into oc-dev
Pankaj Kanwar [Tue, 25 Apr 2017 16:20:51 +0000 (16:20 +0000)]
Merge "Provide an API to make USSD calls and read the responses." am:
41f48e3f18
am:
d6465983f1
Change-Id: I0660aab378b2deee3f52e710a0a413b806dd0792
Pankaj Kanwar [Tue, 25 Apr 2017 16:14:14 +0000 (16:14 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
am:
41f48e3f18
Change-Id: Ia3244783e5df300ae6f8a4ad553e15e7e72f7965
Gustav Sennton [Tue, 25 Apr 2017 16:10:33 +0000 (16:10 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev
am:
3202c10207
Change-Id: I86b040d6ebb0ab8255351c27d92b7d2a818ed60a
Pankaj Kanwar [Tue, 25 Apr 2017 16:08:25 +0000 (16:08 +0000)]
Merge "Provide an API to make USSD calls and read the responses."
Gustav Sennton [Tue, 25 Apr 2017 16:05:53 +0000 (16:05 +0000)]
Merge "Explicitly wait for the WebView Zygote." into oc-dev
Jean-Michel Trivi [Tue, 25 Apr 2017 15:42:21 +0000 (15:42 +0000)]
Merge "VolumeShaper: API change for duration" into oc-dev
am:
44515357ce
Change-Id: I9bbf338a3c3170bd2304637a197c643c8da0a00f
Jean-Michel Trivi [Tue, 25 Apr 2017 15:36:33 +0000 (15:36 +0000)]
Merge "VolumeShaper: API change for duration" into oc-dev
Adam Lesinski [Tue, 25 Apr 2017 15:33:01 +0000 (15:33 +0000)]
Merge "AAPT2: Add better error message when processing invalid files" into oc-dev
am:
b9dbee430d
Change-Id: I64df2268e9dbc80fe4630c068ad8ee58ced5765e
Adam Lesinski [Tue, 25 Apr 2017 15:30:55 +0000 (15:30 +0000)]
Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev
am:
7beb895d75
Change-Id: I7c426e4e8eb6187d044069c577ae68b1af41ea1e
TreeHugger Robot [Tue, 25 Apr 2017 15:26:20 +0000 (15:26 +0000)]
Merge "AAPT2: Add better error message when processing invalid files" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 15:25:57 +0000 (15:25 +0000)]
Merge "AAPT2: Allow <path-permission> tag in <provider>" into oc-dev
Jorim Jaggi [Mon, 24 Apr 2017 16:34:55 +0000 (18:34 +0200)]
Add tracing for onTaskStackChanged
Test: Capture trace
Bug:
37550083
Change-Id: Iee302b189768419fe8a55d041ce65e861ef3c1f1
Rubin Xu [Tue, 25 Apr 2017 13:50:10 +0000 (13:50 +0000)]
Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev
am:
4f86a894e1
Change-Id: I0947dbaa1eb840bffd7299d9fe8a9f6aea118a47
Geoffrey Pitsch [Tue, 25 Apr 2017 13:45:05 +0000 (13:45 +0000)]
Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev
am:
390cdab47c
Change-Id: I422d6b7627378a949c4fbe53098edb0fef1b3050
TreeHugger Robot [Tue, 25 Apr 2017 13:42:38 +0000 (13:42 +0000)]
Merge "Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION" into oc-dev
Etan Cohen [Tue, 25 Apr 2017 13:40:42 +0000 (13:40 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am:
2fd19ffa06 am:
3c6305cc55
am:
887fd90742
Change-Id: I8480ac43d89dc85b541e6255c3cdc597393896cf
Geoffrey Pitsch [Tue, 25 Apr 2017 13:38:45 +0000 (13:38 +0000)]
Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev
Etan Cohen [Tue, 25 Apr 2017 13:34:06 +0000 (13:34 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am:
2fd19ffa06
am:
3c6305cc55
Change-Id: I4e2461f68db983292c167a11746b8cfe47995e77
Etan Cohen [Tue, 25 Apr 2017 13:27:22 +0000 (13:27 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
am:
2fd19ffa06
Change-Id: I8e4a38b113d6e8f81bc382715dda5c279771e454
Etan Cohen [Tue, 25 Apr 2017 13:21:35 +0000 (13:21 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier"
Jorim Jaggi [Tue, 25 Apr 2017 13:08:29 +0000 (15:08 +0200)]
Fix some "leaks"
When Recents goes into the background, we should release all
references to thumbnails so things can be freed.
Test: Go Recents, go home, take heapdump
Bug:
37630958
Change-Id: I79ec994f031393cda67edd8983195e2c541f13fb
Rubin Xu [Tue, 25 Apr 2017 12:17:13 +0000 (12:17 +0000)]
Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev
am:
a31f49a0df
Change-Id: I366df8ae5c7d8af35e47554f095fc927b64f62fb
TreeHugger Robot [Tue, 25 Apr 2017 12:11:10 +0000 (12:11 +0000)]
Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev
Rubin Xu [Tue, 25 Apr 2017 12:07:18 +0000 (12:07 +0000)]
Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev
am:
2c20a6db28
Change-Id: I42086661a5f3969e117e1c07876e48da1392c08e
TreeHugger Robot [Tue, 25 Apr 2017 12:02:02 +0000 (12:02 +0000)]
Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev
Fan Zhang [Tue, 25 Apr 2017 09:59:10 +0000 (09:59 +0000)]
Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev
am:
544cf7793f
Change-Id: Ia03f596609c963f00bdf0f33c228e2c120a09baa
TreeHugger Robot [Tue, 25 Apr 2017 09:52:52 +0000 (09:52 +0000)]
Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev
Felipe Leme [Tue, 25 Apr 2017 09:02:25 +0000 (09:02 +0000)]
Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev
am:
fc513f98d7
Change-Id: I2c947e9dd500ecd8a1573a1ea288ce6b2fbddf6c
TreeHugger Robot [Tue, 25 Apr 2017 08:55:57 +0000 (08:55 +0000)]
Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev
Hugo Benichi [Tue, 25 Apr 2017 08:03:52 +0000 (08:03 +0000)]
Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp
Philip Cuadra [Tue, 25 Apr 2017 07:44:41 +0000 (07:44 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev
am:
6ccc29bba5
Change-Id: I34226849c549621713e4c409bb9449cbc0d79456
Philip P. Moltmann [Tue, 25 Apr 2017 07:39:21 +0000 (07:39 +0000)]
Merge "Take new autofill structure for each partition" into oc-dev
am:
f40d1cb773
Change-Id: I0da0d98bb03d5a1d6156950e9f557115f232c3fb
TreeHugger Robot [Tue, 25 Apr 2017 07:38:40 +0000 (07:38 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 07:31:24 +0000 (07:31 +0000)]
Merge "Take new autofill structure for each partition" into oc-dev
Hugo Benichi [Tue, 25 Apr 2017 07:28:28 +0000 (16:28 +0900)]
NetworkCapabilities: remove duplicated TRANSPORT_NAMES
Due to multi-branch automerging issue, TRANSPORT_NAMES got inserted
twice into NetworkCapabilities both by commits
a365bace7a8e and
9910dbc68211. This patch deletes one of the copy.
Test: no functionality change. Build is fixed.
Change-Id: I2adec1a9cb1ee6f1d61dfeec2d0b92b8141eed88
Eugene Susla [Tue, 25 Apr 2017 06:47:42 +0000 (06:47 +0000)]
Merge "Add javadoc about APIs requiring uses-feature" into oc-dev
am:
07d2cec982
Change-Id: Id9c9ebd126f0fc289c07515455833ec970aff271
Eugene Susla [Tue, 25 Apr 2017 06:46:24 +0000 (06:46 +0000)]
Merge "Check for uses-feature in Companion APIs" into oc-dev
am:
7575fa7600
Change-Id: I99ca8f54d480a8a297a8e82d7c0883a628541b89
TreeHugger Robot [Tue, 25 Apr 2017 06:42:02 +0000 (06:42 +0000)]
Merge "Add javadoc about APIs requiring uses-feature" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 06:42:02 +0000 (06:42 +0000)]
Merge "Check for uses-feature in Companion APIs" into oc-dev
Wale Ogunwale [Tue, 25 Apr 2017 06:09:25 +0000 (06:09 +0000)]
Merge "Continue to @hide freeform decor caption APIs" into oc-dev
am:
302ba2d3ab
Change-Id: I98135d6354a269669e176d9f4dee5b825578ff22
TreeHugger Robot [Tue, 25 Apr 2017 06:03:07 +0000 (06:03 +0000)]
Merge "Continue to @hide freeform decor caption APIs" into oc-dev
Winson Chung [Tue, 25 Apr 2017 05:38:51 +0000 (05:38 +0000)]
Merge "Move RecentsImpl task stack listener to background." into oc-dev
am:
024f80ca82
Change-Id: I8d40752e96a1ea30267acad7be0db02905e28e8c
TreeHugger Robot [Tue, 25 Apr 2017 05:33:01 +0000 (05:33 +0000)]
Merge "Move RecentsImpl task stack listener to background." into oc-dev
Felipe Leme [Tue, 25 Apr 2017 05:15:43 +0000 (05:15 +0000)]
Merge "Hide deprecated APIs." into oc-dev
am:
59fe3108fa
Change-Id: Ib7effcaade703c76e13272f030922233061d3efd
Nathan Harold [Tue, 25 Apr 2017 05:13:24 +0000 (05:13 +0000)]
Merge "Remove the docstring dependency on telephony-common" into oc-dev
am:
b06ff6f256
Change-Id: I62bf5f96f48b4e16e48055b490b4da92096f133e
TreeHugger Robot [Tue, 25 Apr 2017 05:09:23 +0000 (05:09 +0000)]
Merge "Hide deprecated APIs." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 05:05:35 +0000 (05:05 +0000)]
Merge "Remove the docstring dependency on telephony-common" into oc-dev
Fan Zhang [Tue, 25 Apr 2017 04:55:45 +0000 (04:55 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
am:
940f6a9962
Change-Id: I6346e51b77e03eca1c7496ce9fa3ed41c7de2a04
Todd Kennedy [Tue, 25 Apr 2017 04:48:26 +0000 (04:48 +0000)]
Merge "fix check for provider resolution" into oc-dev
am:
ade1496f96
Change-Id: Iced763d26e0872d3b6cc5a124e95c413ad7fc436
Fan Zhang [Tue, 25 Apr 2017 04:48:19 +0000 (04:48 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 04:44:51 +0000 (04:44 +0000)]
Merge "fix check for provider resolution" into oc-dev
lei.xa.liu [Tue, 25 Apr 2017 04:33:15 +0000 (04:33 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev
am:
90c3489525
Change-Id: I77f82bcd38a0cb16226d58a5731c76a630c7e3be
Wale Ogunwale [Tue, 25 Apr 2017 04:31:17 +0000 (04:31 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev
am:
f4472b6507
Change-Id: I2507216075b544eed6b9de4cea0f28e80c5c28d4
TreeHugger Robot [Tue, 25 Apr 2017 04:26:27 +0000 (04:26 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev
TreeHugger Robot [Tue, 25 Apr 2017 04:25:30 +0000 (04:25 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev
Chris Forbes [Tue, 25 Apr 2017 04:19:27 +0000 (04:19 +0000)]
Merge "jni: Adjust for libui gralloc flags change" into oc-dev
am:
3b7c1a32f1
Change-Id: Ib3c4d82de642f7db58bf1ce2729df1b1cf934e55
TreeHugger Robot [Tue, 25 Apr 2017 04:12:26 +0000 (04:12 +0000)]
Merge "jni: Adjust for libui gralloc flags change" into oc-dev
Svetoslav Ganov [Tue, 25 Apr 2017 04:03:19 +0000 (04:03 +0000)]
Merge "Move child package feature behind sys prop" into oc-dev
am:
6b3263a6e2
Change-Id: Ia701ccac097b1296b857928e1283d5b995fcdb6a
Wale Ogunwale [Mon, 24 Apr 2017 20:40:34 +0000 (13:40 -0700)]
Continue to @hide freeform decor caption APIs
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.
May you make the P release!
Test: manual
Bug:
28774476
Change-Id: Ie4b4d1bdabef9b27d2eb1442ffc9f6c46ce7dfcb
Svetoslav Ganov [Tue, 25 Apr 2017 03:58:56 +0000 (03:58 +0000)]
Merge "Move child package feature behind sys prop" into oc-dev
Etan Cohen [Tue, 25 Apr 2017 03:32:56 +0000 (03:32 +0000)]
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
am:
14ff091a1d
Change-Id: Ic6dc86dc91d8024b76c3a6eff506aa5d1aefe594
Etan Cohen [Tue, 25 Apr 2017 03:26:01 +0000 (03:26 +0000)]
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev
Ta-wei Yen [Tue, 25 Apr 2017 03:00:33 +0000 (03:00 +0000)]
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
am:
3db7350d7d
Change-Id: I428d6e101d46e216a1e6e34048f1d3da2fb5314e
TreeHugger Robot [Tue, 25 Apr 2017 02:55:14 +0000 (02:55 +0000)]
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
Eugene Susla [Tue, 25 Apr 2017 02:53:02 +0000 (02:53 +0000)]
Remove 'via Bluetooth' from the choosed dialog
am:
b7aec13d51
Change-Id: I2ab4da7de0d7c269c2f3af59813576b392f603bf
Chris Forbes [Thu, 20 Apr 2017 18:58:45 +0000 (11:58 -0700)]
jni: Adjust for libui gralloc flags change
Change-Id: I94b95fba5e6234a07d2beba1d6f487842399367f
Bug: b/
33350696
Test: Bullhead: booted to launcher, take photo, watch youtube
Felipe Leme [Sat, 22 Apr 2017 00:33:38 +0000 (17:33 -0700)]
Added APIs that let AutofillService implementations set themselves as such.
Bug:
37576671
Test: manual verification
Test: CtsAutoFillServiceTestCases (with new tests) pass
Change-Id: I6fd61f8a2826dbf6b6fce831f3deadf6df025386
Eugene Susla [Tue, 18 Apr 2017 19:43:15 +0000 (12:43 -0700)]
Remove 'via Bluetooth' from the choosed dialog
We no longer limit the items in a single chooser dialog to a devices from
single medium type.
Test: Ensure the dialog UI reflects the change.
Change-Id: Ia2342861f51f89e870f1c6a7fbebf9c1a37cac6a
pkanwar [Mon, 7 Nov 2016 04:11:45 +0000 (20:11 -0800)]
Provide an API to make USSD calls and read the responses.
Test: will be added in a subsequent CL.
Bug:
30973910
Change-Id: Ibf622e154f3f987be547f4f85e15891d4e382118
Svet Ganov [Thu, 20 Apr 2017 06:51:33 +0000 (23:51 -0700)]
Move child package feature behind sys prop
Now one can do adb shell setprop/getptop to change
"persist.sys.child_packages_enabled" to true/false to
control whether child packages are supported.
Test: manual
bug:
36107077
Change-Id: Ie60e255fd3c248905906cdd5b10adae074c0b717
Adrian Roos [Mon, 24 Apr 2017 23:58:26 +0000 (16:58 -0700)]
Perf: Fix RemoteViews memory leak
Fixes an issue where the context wrapper created in
RemoteViews leaks the RemoteViews instance through the
implicit this pointer of anonymous inner classes.
Fixed by replacing with a static inner class.
Bug:
37630958
Test: m droid (this change is not testable)
Change-Id: Ia149b3d91f134f0c308200b46880e7f87542a338
Dmitry Dementyev [Tue, 18 Apr 2017 20:43:31 +0000 (13:43 -0700)]
Update PACKAGE_REMOVED broadcast.
1) Include KEY_ACCOUNT_NAME and KEY_ACCOUNT_TYPE.
2) Only send the broadcast to packages which were able to see the
account.
Test: manual, APCT.
Bug:
37280078
(cherry picked from commit
cbbc99f76224cedb6d680c3cd7f0afc9cc912202)
Change-Id: I3c323e545628199903313096f93654687fa8f22b
Philip P. Moltmann [Fri, 21 Apr 2017 23:33:52 +0000 (16:33 -0700)]
Take new autofill structure for each partition
Bug:
36481649
Test: CtsAutofillServiceTestCases (now with a test that has an autofill
session over two full screen fragments)
Change-Id: I55f2f6203f3bd5a7082b4ce90500d2c16a260c7d
Android Build Merger (Role) [Mon, 24 Apr 2017 23:47:11 +0000 (23:47 +0000)]
Merge "Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5 am:
0efa055590 am:
6e7afc78a7" into oc-dev-plus-aosp
Amith Yamasani [Mon, 24 Apr 2017 23:46:28 +0000 (23:46 +0000)]
Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5 am:
0efa055590
am:
6e7afc78a7
Change-Id: Iec01fcd319146183e6e958974d494aeeb698c7c5
Jean-Michel Trivi [Mon, 24 Apr 2017 23:44:22 +0000 (23:44 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
am:
9e55fcbdc2
Change-Id: Id7a2620c784e6bc2bee287d0ef3836f890f227b8
Amith Yamasani [Mon, 24 Apr 2017 23:42:27 +0000 (23:42 +0000)]
Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5
am:
0efa055590
Change-Id: Ibed5b8045215e0d4dd4e20aa2778ec5a16c715e2
OSDN Git Service
