OSDN Git Service
Geoffrey Pitsch [Tue, 25 Apr 2017 13:50:40 +0000 (13:50 +0000)]
Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev am:
390cdab47c
am:
442a4e4c91
Change-Id: I9de7dc27370a73da838c7c5540faa6542e4a9432
Etan Cohen [Tue, 25 Apr 2017 13:46:42 +0000 (13:46 +0000)]
Merge "[AWARE] Add UID checking to WifiAwareNetworkSpecifier" am:
2fd19ffa06 am:
3c6305cc55 am:
887fd90742
am:
79d9e99632
Change-Id: I4ef57924507633315ed0dbd5f18abbd9138de572
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
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"
Rubin Xu [Tue, 25 Apr 2017 12:23:17 +0000 (12:23 +0000)]
Merge "Add param javadoc to DevicePolicyManager.setBackupServiceEnabled" into oc-dev am:
a31f49a0df
am:
e45651ba8f
Change-Id: I2c4e924c5e6a3317aca31ca56676e73e641e261e
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
Rubin Xu [Tue, 25 Apr 2017 12:13:16 +0000 (12:13 +0000)]
Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev am:
2c20a6db28
am:
0a555a6595
Change-Id: I6e22acaa9a183f97874f75ba71dc9ca1434ff60e
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 10:05:13 +0000 (10:05 +0000)]
Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev am:
544cf7793f
am:
17b995d042
Change-Id: I9300448d8a60399e839dbf20bb5fea5afd7b291b
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:11:04 +0000 (09:11 +0000)]
Merge "Added APIs that let AutofillService implementations set themselves as such." into oc-dev am:
fc513f98d7
am:
535422c80b
Change-Id: I978f429f100af65df6483364a90e29fc26ae0379
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:09:32 +0000 (08:09 +0000)]
Merge "NetworkCapabilities: remove duplicated TRANSPORT_NAMES" into oc-dev-plus-aosp
am:
c3d2f25a5d
Change-Id: I1e039236d7d4eda6354c81440fbbc43346376f23
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:53:30 +0000 (07:53 +0000)]
Merge "Allow Bluetooth CAP_SYS_NICE, set RT priority for Bluetooth HAL" into oc-dev am:
6ccc29bba5
am:
d6cf20fad6
Change-Id: I96f462f042acb8b26234e2d1fc5bbef0eb6a8fa9
Philip P. Moltmann [Tue, 25 Apr 2017 07:45:46 +0000 (07:45 +0000)]
Merge "Take new autofill structure for each partition" into oc-dev am:
f40d1cb773
am:
5a3ac07443
Change-Id: I425fcac1d41c82c3ba30144c899ced64def472f2
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:54:10 +0000 (06:54 +0000)]
Merge "Add javadoc about APIs requiring uses-feature" into oc-dev am:
07d2cec982
am:
0cc9c8090d
Change-Id: I2b763f91adfc6f6dc25915f6a41efffdcc44ea42
Eugene Susla [Tue, 25 Apr 2017 06:52:53 +0000 (06:52 +0000)]
Merge "Check for uses-feature in Companion APIs" into oc-dev am:
7575fa7600
am:
0f88845e56
Change-Id: Ib5272433ce9af4356eb57c50235b488e3f2e2d5a
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:15:30 +0000 (06:15 +0000)]
Merge "Continue to @hide freeform decor caption APIs" into oc-dev am:
302ba2d3ab
am:
8f8c43bde8
Change-Id: Ied400c025038549532913a5f9d4ccd8573da5a4f
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:44:24 +0000 (05:44 +0000)]
Merge "Move RecentsImpl task stack listener to background." into oc-dev am:
024f80ca82
am:
6120510e8e
Change-Id: I15dd5d31070a701b99e960787d14f0da7bf4d05b
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:28:21 +0000 (05:28 +0000)]
Merge "Hide deprecated APIs." into oc-dev am:
59fe3108fa
am:
4e71ae1243
Change-Id: Ib15e77c4ad3915ed41837584e587c2abbc6657de
Nathan Harold [Tue, 25 Apr 2017 05:21:39 +0000 (05:21 +0000)]
Merge "Remove the docstring dependency on telephony-common" into oc-dev am:
b06ff6f256
am:
49d4e5e413
Change-Id: Iabd238e291c882db18b4bca2171b7c9b5bcff9d2
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 05:01:50 +0000 (05:01 +0000)]
Merge "Fix SettingsDrawerActivityTest on fugu." into oc-dev am:
940f6a9962
am:
bb6f84699e
Change-Id: I74de73282d33260ea99e240fcf904c1ab39361dc
Todd Kennedy [Tue, 25 Apr 2017 04:57:10 +0000 (04:57 +0000)]
Merge "fix check for provider resolution" into oc-dev am:
ade1496f96
am:
3627c9479a
Change-Id: I01241d8f5c5e13be273a5187502267c633e5fd9c
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:42:12 +0000 (04:42 +0000)]
Merge "Remove redundant lockscreen shown check" into oc-dev am:
90c3489525
am:
9af8f27ef9
Change-Id: I510e2df0d5f55df6f2f3864273fec2b07844ba45
Wale Ogunwale [Tue, 25 Apr 2017 04:37:21 +0000 (04:37 +0000)]
Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev am:
f4472b6507
am:
a805e2cc22
Change-Id: Ie36d9fd65d934f270c7f648bb37b42a7d93a8739
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
Chris Forbes [Tue, 25 Apr 2017 04:26:34 +0000 (04:26 +0000)]
Merge "jni: Adjust for libui gralloc flags change" into oc-dev am:
3b7c1a32f1
am:
d8b8a23dc9
Change-Id: I4f06e32ecf8c4bbe018907efa3b86b98fc6e20bd
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:09:16 +0000 (04:09 +0000)]
Merge "Move child package feature behind sys prop" into oc-dev am:
6b3263a6e2
am:
f9b00d77b8
Change-Id: Id647581dc8826b2b872440caab817e1a0385b0e6
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:40:20 +0000 (03:40 +0000)]
Merge "[AWARE] Add AutoCloseable interface/implementation" into oc-dev am:
14ff091a1d
am:
b1e35762b9 -s ours
Change-Id: I2baa41c5268ec19b2115b9fc9981b10eb47f2d35
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
TreeHugger Robot [Tue, 25 Apr 2017 03:26:53 +0000 (03:26 +0000)]
Merge "Allow a11y listeners to specify handlers"
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:07:42 +0000 (03:07 +0000)]
Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev am:
3db7350d7d
am:
683624afd2
Change-Id: I9be453eb96cce94af91c76253c5667fe470fb9bc
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
Eugene Susla [Tue, 25 Apr 2017 02:57:06 +0000 (02:57 +0000)]
Remove 'via Bluetooth' from the choosed dialog am:
b7aec13d51
am:
d0e822894b
Change-Id: I364ef676d702b0991b15eff2f09c1dc81110aa67
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
Phil Weaver [Fri, 21 Apr 2017 00:19:14 +0000 (17:19 -0700)]
Allow a11y listeners to specify handlers
This follows recommended practice for listeners, and also
allows ViewRootImpl to register for callbacks on its own
handler, which can prevent crashes in apps that have
different threads managing the UI at different times (for
example the system process).
Bug:
37542371
Test: Adding CTS tests for new APIs. A11y CTS still passes.
Change-Id: I65db025275e153c20b20567346246d5bc13bf418
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
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
Dmitry Dementyev [Mon, 24 Apr 2017 23:54:31 +0000 (23:54 +0000)]
Merge "Update PACKAGE_REMOVED broadcast."
Amith Yamasani [Mon, 24 Apr 2017 23:52:20 +0000 (23:52 +0000)]
Merge "Merge "Check Bluetooth app id instead of uid" am:
7d4a354fd5 am:
0efa055590 am:
6e7afc78a7" into oc-dev-plus-aosp
am:
e7e7a1655a
Change-Id: Iffaf0d2610f0735c0717fb117f57ee6423cc67d8
Jean-Michel Trivi [Mon, 24 Apr 2017 23:50:25 +0000 (23:50 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev am:
9e55fcbdc2
am:
c2c0008c68
Change-Id: I4b35c08e151401ebabf7740f706b79d7911838f8
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
Jean-Michel Trivi [Mon, 24 Apr 2017 23:39:41 +0000 (23:39 +0000)]
Merge "AudioService: make PlaybackActivityMonitor less log-chatty" into oc-dev
Adam Lesinski [Mon, 24 Apr 2017 23:37:13 +0000 (23:37 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev am:
76831f7e39
am:
085abab5ba
Change-Id: Ic5e4a29f2b81aac05cf53b99190e92989163e412
Amith Yamasani [Mon, 24 Apr 2017 23:36:58 +0000 (23:36 +0000)]
Merge "Check Bluetooth app id instead of uid"
am:
7d4a354fd5
Change-Id: Ib79ace5311606520ae84c4ba37ffc64a538428d6
Felipe Leme [Mon, 24 Apr 2017 23:32:33 +0000 (23:32 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev am:
0fe852080e
am:
8ecd9c47f7 -s ours
Change-Id: Ie286abe6634ad32bb7806a312630cf1f40b5d9c6
Adam Lesinski [Mon, 24 Apr 2017 23:31:26 +0000 (23:31 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev
am:
76831f7e39
Change-Id: Ia2a30b7b9f4f11afdbf3ee020288a8d29245a4f4
TreeHugger Robot [Mon, 24 Apr 2017 23:31:06 +0000 (23:31 +0000)]
Merge "Don't skip intents where config changed."
Treehugger Robot [Mon, 24 Apr 2017 23:30:51 +0000 (23:30 +0000)]
Merge "Check Bluetooth app id instead of uid"
TreeHugger Robot [Mon, 24 Apr 2017 23:26:01 +0000 (23:26 +0000)]
Merge changes I7d2b7e50,I784406a6 into oc-dev
* changes:
AAPT2: Allow truncating of package names
AAPT2: Make BinaryResourceParser more lenient
Etan Cohen [Mon, 24 Apr 2017 23:25:06 +0000 (23:25 +0000)]
Merge "[AWARE] Remove match style API" into oc-dev am:
2be0a532bf
am:
1945f3ad2e
Change-Id: I94ddbb5eae5ff644b5b06b57633762b6bce8433f
Felipe Leme [Mon, 24 Apr 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev
am:
0fe852080e
Change-Id: Ic755dc978f745de36018af56a6ad851f138d98b0
Ruben Brunk [Mon, 24 Apr 2017 23:15:02 +0000 (23:15 +0000)]
Merge "Fix re-enabling alert window appop after leaving VR mode." into oc-dev am:
d8f13bbc3d
am:
80e2f403d2
Change-Id: I848538c372bdb95ec4e13babe4dc1da7ac455ce9
Felipe Leme [Mon, 24 Apr 2017 23:10:48 +0000 (23:10 +0000)]
Merge "Minor fixes on Autofill Framework:" into oc-dev
OSDN Git Service
