OSDN Git Service
Jean-Michel Trivi [Tue, 4 Apr 2017 15:40:34 +0000 (15:40 +0000)]
Merge "AudioAttributes: remove static getVolumeControlStream method" into oc-dev
am:
adc1605530
Change-Id: I41e42c383dd1746835fab4a7d1712ab4323636d2
TreeHugger Robot [Tue, 4 Apr 2017 15:32:20 +0000 (15:32 +0000)]
Merge "AudioAttributes: remove static getVolumeControlStream method" into oc-dev
Jorim Jaggi [Tue, 4 Apr 2017 15:31:57 +0000 (15:31 +0000)]
Merge "Recompute focus in showLw if needed" into oc-dev
am:
49028f0199
Change-Id: I38f184fb96e62bce8c03239541b23f3db3649c90
TreeHugger Robot [Tue, 4 Apr 2017 15:22:40 +0000 (15:22 +0000)]
Merge "Recompute focus in showLw if needed" into oc-dev
Chris Wren [Tue, 4 Apr 2017 14:40:23 +0000 (14:40 +0000)]
Merge "standardize account manager notification IDs" into oc-dev
am:
31a6d784d6
Change-Id: Iee5bed5eb67170a1dd231aef3fab5ee1f1491857
TreeHugger Robot [Tue, 4 Apr 2017 14:35:30 +0000 (14:35 +0000)]
Merge "standardize account manager notification IDs" into oc-dev
Jorim Jaggi [Tue, 4 Apr 2017 14:27:50 +0000 (14:27 +0000)]
Merge "Fix NPE when status bar isn't available" into oc-dev
am:
acd2827f3e
Change-Id: I61f18d0904e866e44bb515e7e3220ffb9ce556cb
TreeHugger Robot [Tue, 4 Apr 2017 14:21:22 +0000 (14:21 +0000)]
Merge "Fix NPE when status bar isn't available" into oc-dev
Bartosz Fabianowski [Tue, 4 Apr 2017 14:10:55 +0000 (14:10 +0000)]
Merge "Launch Intents from QS security footer as current user" into oc-dev
am:
c027f94177
Change-Id: I1e12f5e1756f929c89e258f994181edb940d81f8
TreeHugger Robot [Tue, 4 Apr 2017 14:04:31 +0000 (14:04 +0000)]
Merge "Launch Intents from QS security footer as current user" into oc-dev
Jorim Jaggi [Tue, 4 Apr 2017 13:09:51 +0000 (15:09 +0200)]
Recompute focus in showLw if needed
When the status bar window was relayouted it wasn't visible by
policy (yet). Thus, it couldn't get focus even though
FLAG_NOT_FOCUSABLE was not set. Shortly after, it was made
visible and thus able to receive focus, but nobody actually
kicked off another focus calculation.
Test: Set device password, open camera from lockscreen,
adb shell wm dismiss-keyguard
Fixes:
36242569
Change-Id: Iafbeac45d25490243b701434008e65f545cebbdf
Jorim Jaggi [Tue, 4 Apr 2017 13:18:42 +0000 (13:18 +0000)]
Boost thread priority when holding the WM lock
am:
36db127e47
Change-Id: I3c98498137581ec39555b0283b1cb59d7639a7e2
Chris Wren [Fri, 31 Mar 2017 19:34:39 +0000 (15:34 -0400)]
standardize account manager notification IDs
Bug:
36807942
Test: frameworks/base/services/tests/runtests/py
Change-Id: Iad5383ebbf9cf1765da5ad7405da1f79a3761c63
Jorim Jaggi [Mon, 27 Mar 2017 22:43:31 +0000 (00:43 +0200)]
Boost thread priority when holding the WM lock
Test: Take systrace of open app, make sure thead is boosted while
doing stuff in WM
Test: Run WmSlam with and without boosting. Observe an
improvement.
Bug:
36631902
Change-Id: Iadb036f8d12bbf59091466500e82207cf6fa85d5
Jorim Jaggi [Tue, 4 Apr 2017 10:51:03 +0000 (12:51 +0200)]
Fix NPE when status bar isn't available
Status bar isn't there in CryptKeeper.
Test: Boot non-direct-boot device
Change-Id: I8cbf1bfbebc917b03f528f040bb019d193228bbb
Fixes:
36407040
Jorim Jaggi [Tue, 4 Apr 2017 09:32:04 +0000 (09:32 +0000)]
Merge "Schedule window animations at vsync-sf" into oc-dev
am:
de95d544cd
Change-Id: I0d6377d0cafdf33a7872ddda15d796147e0f4a60
Jorim Jaggi [Tue, 4 Apr 2017 09:26:00 +0000 (09:26 +0000)]
Merge "Schedule window animations at vsync-sf" into oc-dev
Jorim Jaggi [Tue, 4 Apr 2017 09:23:35 +0000 (09:23 +0000)]
Merge "Handle case when snapshot dimensions don't match" into oc-dev
am:
1edadac465
Change-Id: Icbe3f3c26cf65e7b12f5567a9bc40f7e0a3bd578
Jorim Jaggi [Tue, 4 Apr 2017 09:14:35 +0000 (09:14 +0000)]
Merge "Handle case when snapshot dimensions don't match" into oc-dev
Jiwen 'Steve' Cai [Tue, 4 Apr 2017 04:41:42 +0000 (04:41 +0000)]
Merge "ANativeWindow_toSurface implementation" into oc-dev
am:
7e5d2c23a4
Change-Id: I43258cd59a653fb6938a96d27579bf48d92a3195
Casey Burkhardt [Tue, 4 Apr 2017 04:38:57 +0000 (04:38 +0000)]
Merge "Fix AccessibilityManager returning duplicate services" into oc-dev
am:
3bf7c7634a
Change-Id: If13ea24cf2d10a197d513029728f1135bb3be537
TreeHugger Robot [Tue, 4 Apr 2017 04:30:11 +0000 (04:30 +0000)]
Merge "ANativeWindow_toSurface implementation" into oc-dev
Casey Burkhardt [Tue, 4 Apr 2017 04:29:21 +0000 (04:29 +0000)]
Merge "Fix AccessibilityManager returning duplicate services" into oc-dev
Jack He [Tue, 4 Apr 2017 03:54:46 +0000 (03:54 +0000)]
Merge "Bluetooth: Ensure only desired intents are being handled" into oc-dev
am:
d2778f32e2
Change-Id: Ia7b60079b09f6277d2b5c0959fe6fa9d1f2959e3
TreeHugger Robot [Tue, 4 Apr 2017 03:49:14 +0000 (03:49 +0000)]
Merge "Bluetooth: Ensure only desired intents are being handled" into oc-dev
Ian Pedowitz [Tue, 4 Apr 2017 03:45:50 +0000 (03:45 +0000)]
Merge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev
am:
61117c61d7
Change-Id: I77085a9cc1465d4c4295e5a6b666b677aec6ce25
Ian Pedowitz [Tue, 4 Apr 2017 03:38:55 +0000 (03:38 +0000)]
Merge "Revert "Refresh opacity and statefulness on tint change"" into oc-dev
Adam Lesinski [Tue, 4 Apr 2017 03:33:42 +0000 (03:33 +0000)]
Merge "Themes: Apply themes to system_server safely" into oc-dev
am:
a52fc49845
Change-Id: I85c390f99600d4f6cf75c9b3a4b1c39e7b874335
Ajay Panicker [Tue, 4 Apr 2017 03:32:42 +0000 (03:32 +0000)]
Merge "Make sure that the device name is not null before returning it" into oc-dev
am:
0f20dcdcb0
Change-Id: I7d2a4101ebe29892e3dd365dc5531866bc8d3b2c
Yohei Yukawa [Tue, 4 Apr 2017 03:30:01 +0000 (03:30 +0000)]
Revert "Refresh opacity and statefulness on tint change"
This reverts commit
1eda069f7c9a36e58c17ecf185a5c0906be5df95.
Reason to revert:
The setup wizard started throwing android.view.InflateException due to
I89f6d804fb025f426aefdee67559778cf03015bb. Temporarily reverting that
change until we figure out what is going on.
Change-Id: I9344a3402f2fab02f4fe49a6a8ad91970b2d3b3e
Test: Manually verified that the setup wizard no longer crashes.
Bug:
33124798
Bug:
36870685
TreeHugger Robot [Tue, 4 Apr 2017 03:25:25 +0000 (03:25 +0000)]
Merge "Themes: Apply themes to system_server safely" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 03:24:14 +0000 (03:24 +0000)]
Merge "Make sure that the device name is not null before returning it" into oc-dev
Bryce Lee [Tue, 4 Apr 2017 03:10:13 +0000 (03:10 +0000)]
Merge "Clean up activity/stack associations." into oc-dev
am:
9f467df804
Change-Id: I1c7d75fec994d50cdb55fb798e4ed0c9beadab09
Robert Sesek [Tue, 4 Apr 2017 03:09:15 +0000 (03:09 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." into oc-dev
am:
641691901e
Change-Id: I2e89af6876bfe0a9af9551453924580643bd13f8
Bryce Lee [Tue, 4 Apr 2017 03:01:46 +0000 (03:01 +0000)]
Merge "Clean up activity/stack associations." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 02:59:30 +0000 (02:59 +0000)]
Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." into oc-dev
Jean-Michel Trivi [Tue, 4 Apr 2017 02:47:17 +0000 (02:47 +0000)]
Merge "Audio focus: API for external audio focus policy" into oc-dev
am:
4d52ae9707
Change-Id: I68deedce617588f0d7947183892727b5ed6c18b4
TreeHugger Robot [Tue, 4 Apr 2017 02:39:58 +0000 (02:39 +0000)]
Merge "Audio focus: API for external audio focus policy" into oc-dev
Jiwen 'Steve' Cai [Fri, 31 Mar 2017 18:19:50 +0000 (11:19 -0700)]
ANativeWindow_toSurface implementation
This enables the conversion from an ANativeWindow (created by NDK API
such as: AImageReader_create) to a Java Surface, so that developers can
hookup a Java Producer to a native buffer consumer.
This CL also introduces android_view_Surface_createFromSurface helper
function in libandroid_runtime to convert a C++ sp<Surface> to a Java
Surface object.
Bug:
36862948
Test: android.media.cts.NativeImageReaderTest
Change-Id: Ia99adb654da505ac117a8e58153ac800df23a650
Philip P. Moltmann [Tue, 4 Apr 2017 02:05:16 +0000 (02:05 +0000)]
Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev
am:
c56defe9c0
Change-Id: I1f35ccc57b721fc72fdb22f0bd98c9436b1570e8
TreeHugger Robot [Tue, 4 Apr 2017 01:57:15 +0000 (01:57 +0000)]
Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev
Jack He [Mon, 3 Apr 2017 22:13:57 +0000 (15:13 -0700)]
Bluetooth: Ensure only desired intents are being handled
* Prevent arbitrary intents from making Bluetooth undiscoverable by only
allowing DISCOVERABLE_TIMEOUT intent to be handled
Bug:
33058582
Test: make, test for Broadcast and Bluetooth scanning
Change-Id: Ib8b04dddf1610a082d167825253f3e1c968aaa14
Andrii Kulian [Tue, 4 Apr 2017 01:49:35 +0000 (01:49 +0000)]
Merge "Update display contents when metrics change" into oc-dev
am:
d6f0b0fc4f
Change-Id: I808ab4d68954773ba8c8691478d9fe47e1e2378f
Jeff Sharkey [Tue, 4 Apr 2017 01:48:26 +0000 (01:48 +0000)]
Merge "Emit fingerprints during OTA upgrades." into oc-dev
am:
19627d678b
Change-Id: I3a545f11f50716b23e3d110950afee179aecf7fa
Ajay Panicker [Tue, 4 Apr 2017 01:42:47 +0000 (01:42 +0000)]
Merge "Make sure that the device name is not null before returning it" am:
d4963e8035 am:
87d114ac3e
am:
c6438a68d6
Change-Id: I90c31e9f1c304d6696908d3518c3e96940fea8f6
Andrii Kulian [Tue, 4 Apr 2017 01:38:22 +0000 (01:38 +0000)]
Merge "Update display contents when metrics change" into oc-dev
Daniel Cardenas [Tue, 4 Apr 2017 01:38:16 +0000 (01:38 +0000)]
Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev
am:
d017221a52
Change-Id: Icf9271e418052931ca15c3a7727f01cfedd044c9
Ajay Panicker [Tue, 4 Apr 2017 01:35:05 +0000 (01:35 +0000)]
Merge "Make sure that the device name is not null before returning it" am:
d4963e8035
am:
87d114ac3e
Change-Id: I874a58ecc54ddd46837c6e21b6244e5bb40312d7
TreeHugger Robot [Tue, 4 Apr 2017 01:33:24 +0000 (01:33 +0000)]
Merge "Emit fingerprints during OTA upgrades." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 01:28:37 +0000 (01:28 +0000)]
Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev
Ajay Panicker [Tue, 4 Apr 2017 01:27:41 +0000 (01:27 +0000)]
Merge "Make sure that the device name is not null before returning it"
am:
d4963e8035
Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225
Dongwon Kang [Tue, 4 Apr 2017 01:19:09 +0000 (01:19 +0000)]
Merge "TIF: use integer for constants instead of string" into oc-dev
am:
b43a5305bd
Change-Id: I84143eee4102a8e40f74571b8c8903ff5a10cb56
Ajay Panicker [Mon, 3 Apr 2017 19:15:54 +0000 (12:15 -0700)]
Make sure that the device name is not null before returning it
Bug:
30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c
Treehugger Robot [Tue, 4 Apr 2017 01:11:07 +0000 (01:11 +0000)]
Merge "Make sure that the device name is not null before returning it"
TreeHugger Robot [Tue, 4 Apr 2017 01:10:39 +0000 (01:10 +0000)]
Merge "TIF: use integer for constants instead of string" into oc-dev
Hugo Benichi [Tue, 4 Apr 2017 00:58:02 +0000 (00:58 +0000)]
Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev
am:
df9cf5450c
Change-Id: I7d7b66cc1dc6888ea28e2b4d83d570fa440c29f2
Hugo Benichi [Tue, 4 Apr 2017 00:50:20 +0000 (00:50 +0000)]
Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev
Robert Sesek [Mon, 20 Mar 2017 21:30:05 +0000 (17:30 -0400)]
In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE.
When creating an isolatedProcess=true service and when the native bridge
is in use, MountEmulatedStorage() is called with force_mount_namespace=true
and MOUNT_EXTERNAL_NONE. This led to an abort crash, since the process
would attempt to mount an empty path string.
Test: android.externalservice.cts.ExternalServiceTest built for ARM, run on Fugu
Bug:
36072260
Change-Id: I9441bcbd30167971ad486726bbeae57f3c4aebe9
Merged-In: I88474b6f50ae7cfab40ba44ff1da0df6021a2fb0
(cherry picked from commit
06f393067772f613e938f794444dc90e90c40fc0)
Felipe Leme [Tue, 4 Apr 2017 00:45:29 +0000 (00:45 +0000)]
Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev
am:
5efad86b91
Change-Id: I090ee3668c21a49b570d323a0f765da10088c4c6
Winson Chung [Tue, 4 Apr 2017 00:44:32 +0000 (00:44 +0000)]
Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev
am:
afb6b504b2
Change-Id: I0de879374d452f20a6b678aaf2f506034c21c749
Jason Monk [Tue, 4 Apr 2017 00:43:33 +0000 (00:43 +0000)]
Merge "Add some strings that will be needed for QS changes" into oc-dev
am:
f2764a4aed
Change-Id: Id89770140b8cac1ec746aff6a9c1fd4049449254
Hangyu Kuang [Tue, 4 Apr 2017 00:42:31 +0000 (00:42 +0000)]
Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev
am:
99442d3427
Change-Id: I4fc864ea29049ea4585dd71ee8a921b35ae7e147
TreeHugger Robot [Tue, 4 Apr 2017 00:39:52 +0000 (00:39 +0000)]
Merge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:39:05 +0000 (00:39 +0000)]
Merge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:35:37 +0000 (00:35 +0000)]
Merge "Add some strings that will be needed for QS changes" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:33:42 +0000 (00:33 +0000)]
Merge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev
Chad Brubaker [Tue, 4 Apr 2017 00:31:01 +0000 (00:31 +0000)]
Merge "Expose animator settings to Instant Apps" into oc-dev
am:
d490fe0372
Change-Id: I3a88cc331949e987462aca315e7f396d5491147b
TreeHugger Robot [Tue, 4 Apr 2017 00:23:30 +0000 (00:23 +0000)]
Merge "Expose animator settings to Instant Apps" into oc-dev
Jesse Evans [Tue, 4 Apr 2017 00:04:29 +0000 (00:04 +0000)]
Merge "Adds appropriate filtering for instant apps" into oc-dev
am:
de5be11955
Change-Id: I7c4ea3c1bfcefa59cf0abedc3c5c1d8ec8effa08
Keun-young Park [Mon, 3 Apr 2017 23:59:29 +0000 (23:59 +0000)]
Merge "support shutdown animation from bootanim" into oc-dev
am:
67b898a3db
Change-Id: I10eb52e2c6b68001c3a52bb33e170cf4c10f956e
Chad Brubaker [Mon, 3 Apr 2017 23:58:25 +0000 (23:58 +0000)]
Merge "Expose framework activities to Instant Apps" into oc-dev
am:
b157f08bf8
Change-Id: I250524c3ad576b8af2643b08b519d24832c73415
TreeHugger Robot [Mon, 3 Apr 2017 23:55:14 +0000 (23:55 +0000)]
Merge "Adds appropriate filtering for instant apps" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:51:34 +0000 (23:51 +0000)]
Merge "support shutdown animation from bootanim" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:51:02 +0000 (23:51 +0000)]
Merge "Expose framework activities to Instant Apps" into oc-dev
Philip P. Moltmann [Mon, 3 Apr 2017 23:51:02 +0000 (23:51 +0000)]
Merge "Not send switch intents if there is no real intent" into oc-dev
am:
82331f7f73
Change-Id: Ief39b33a90bbc6d9428006baccd6b293572d17f3
TreeHugger Robot [Mon, 3 Apr 2017 23:44:41 +0000 (23:44 +0000)]
Merge "Not send switch intents if there is no real intent" into oc-dev
Makoto Onuki [Mon, 3 Apr 2017 23:38:55 +0000 (23:38 +0000)]
Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev
am:
5fd39fad26
Change-Id: I5b81cd880d505d8525a6210525c2b9c0c09b57a0
Tony Mak [Mon, 3 Apr 2017 23:37:56 +0000 (23:37 +0000)]
Merge "Whitelist DMAgent from bg check" into oc-dev
am:
fcfb396f5e
Change-Id: Ib9ea7bfae3cd7ba6d932bbe9cbd2a05d45516c45
Bryce Lee [Mon, 20 Mar 2017 21:20:22 +0000 (14:20 -0700)]
Clean up activity/stack associations.
The stack currently holds a reference to resuming and pausing
activities. These are usually cleaned up when the activity ends or
the task is reparented. However, it is possible for an activity to
lose its reference to its task in other areas (such as
ActivityStarter), which can lead to the stack not being updated
correctly.
This changelist adds a method to the ActivityStack to disassociate
the stack from an ActivityRecord. In addition to places where this is
called when an activity ends, this method is invoked on the children
of a task when the task is reparented. The task member variable of
ActivityRecord is also now surrounded by a setter/getter, with the
setter always invoking the dissociation logic on a previous stack.
Test: bit FrameworksServicesTests:com.android.server.am.ActivityRecordTests
Change-Id: Iffeccdb6f011958896271673946acfed28856f53
Fixes:
36387417
TreeHugger Robot [Mon, 3 Apr 2017 23:31:56 +0000 (23:31 +0000)]
Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:30:36 +0000 (23:30 +0000)]
Merge "Whitelist DMAgent from bg check" into oc-dev
Jeff Sharkey [Mon, 3 Apr 2017 23:22:35 +0000 (17:22 -0600)]
Emit fingerprints during OTA upgrades.
Can be used to help confirm diagnosis of bugs like
34525014.
Test: builds, boots
Bug:
36795529
Change-Id: Ie2517061ef031716c493b2544b0fb95628f20737
Evan Rosky [Mon, 3 Apr 2017 23:17:45 +0000 (23:17 +0000)]
Merge "Handle edge-case where the focus-search root is focused" into oc-dev
am:
fe9ce65491
Change-Id: I8232e1313e9e9babb152fcd03f1e6e224a979e52
Evan Rosky [Mon, 3 Apr 2017 23:10:48 +0000 (23:10 +0000)]
Merge "Handle edge-case where the focus-search root is focused" into oc-dev
Daniel Cardenas [Mon, 3 Apr 2017 21:42:42 +0000 (14:42 -0700)]
Increase visibility of FEATURE_LEANBACK_ONLY
Bug:
36003137
Test: Build on Fugu and CTS
Change-Id: Iab9be686a004c5c0d1fae02a33898f7ebb264b27
Alan Viverette [Mon, 3 Apr 2017 22:57:11 +0000 (22:57 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev
am:
265dbc1f09
Change-Id: Ie5a0ab7ff9f107ef386d9d5dae6b30bfbd93b6f6
TreeHugger Robot [Mon, 3 Apr 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev
Pankaj Kanwar [Mon, 3 Apr 2017 22:41:17 +0000 (22:41 +0000)]
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev
am:
37bbb789af
Change-Id: I5181ea040e2406c9b7bc2bb8c16f2b1a8d35946e
Pankaj Kanwar [Mon, 3 Apr 2017 22:35:59 +0000 (22:35 +0000)]
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev
Dianne Hackborn [Mon, 3 Apr 2017 22:32:11 +0000 (22:32 +0000)]
Merge "Framework support to improve bg check CTS tests." into oc-dev
am:
78e8ac9c14
Change-Id: Ibc14492d2ce3cf312f7478a6f6edaf383d26f657
Jason Monk [Mon, 3 Apr 2017 22:27:01 +0000 (18:27 -0400)]
Add some strings that will be needed for QS changes
Test: make
Bug:
34765805
Change-Id: I8824314ffe7c91502dc6b516506a98507cdf03ab
Jeff Sharkey [Mon, 3 Apr 2017 22:26:03 +0000 (22:26 +0000)]
Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev
am:
a73aee4cdc
Change-Id: I6b1bfbc5365906b0e8eb7a058fdda01297ef4c56
TreeHugger Robot [Mon, 3 Apr 2017 22:25:53 +0000 (22:25 +0000)]
Merge "Framework support to improve bg check CTS tests." into oc-dev
Yohei Yukawa [Mon, 3 Apr 2017 22:24:34 +0000 (22:24 +0000)]
Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev
am:
1061992733
Change-Id: Ief8593eb666c0162fa30753471112f2ab64f1e38
Makoto Onuki [Mon, 3 Apr 2017 22:23:35 +0000 (22:23 +0000)]
Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
am:
6a7a967b71
Change-Id: I7b8cba52ec500fb789171d4dd97e467a8b926bfa
TreeHugger Robot [Mon, 3 Apr 2017 22:17:13 +0000 (22:17 +0000)]
Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev
Sanket Padawe [Mon, 3 Apr 2017 22:16:54 +0000 (22:16 +0000)]
Merge "Make some intents public in SubscriptionManager." into oc-dev
am:
9077faab1f
Change-Id: I5cfb95fd6965c58adfb86e4a607123b648d10b24
Yohei Yukawa [Mon, 3 Apr 2017 22:14:25 +0000 (22:14 +0000)]
Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 22:13:26 +0000 (22:13 +0000)]
Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
Sanket Padawe [Mon, 3 Apr 2017 22:10:24 +0000 (22:10 +0000)]
Merge "Make some intents public in SubscriptionManager." into oc-dev