OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Increase visibility of FEATURE_LEANBACK_ONLY" 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

7 years agoMerge "Increase visibility of FEATURE_LEANBACK_ONLY" 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

7 years agoMerge "TIF: use integer for constants instead of string" into oc-dev
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

7 years agoMerge "TIF: use integer for constants instead of string" into oc-dev
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

7 years agoMerge "Move back networking policy logic into NetworkPolicyManagerService" 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

7 years agoMerge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev
Hugo Benichi [Tue, 4 Apr 2017 00:50:20 +0000 (00:50 +0000)]
Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev

7 years agoMerge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev
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

7 years agoMerge "Fixing issue with activity incorrectly auto-entering PiP." into oc-dev
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

7 years agoMerge "Add some strings that will be needed for QS changes" into oc-dev
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

7 years agoMerge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." into oc-dev
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

7 years agoMerge "Fixed NPE when FillService replies with a null FillResponse." into oc-dev
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

7 years agoMerge "Fixing issue with activity incorrectly auto-entering PiP." 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

7 years agoMerge "Add some strings that will be needed for QS changes" 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

7 years agoMerge "media: unhide mediarecorder's setVideoEncodingProfileLevel api." 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

7 years agoMerge "Expose animator settings to Instant Apps" 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

7 years agoMerge "Expose animator settings to Instant Apps" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 00:23:30 +0000 (00:23 +0000)]
Merge "Expose animator settings to Instant Apps" into oc-dev

7 years agoMerge "Adds appropriate filtering for 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

7 years agoMerge "support shutdown animation from bootanim" into oc-dev
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

7 years agoMerge "Expose framework activities to Instant Apps" into oc-dev
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

7 years agoMerge "Adds appropriate filtering for instant apps" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 23:55:14 +0000 (23:55 +0000)]
Merge "Adds appropriate filtering for instant apps" into oc-dev

7 years agoMerge "support shutdown animation from bootanim" 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

7 years agoMerge "Expose framework activities to Instant Apps" 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

7 years agoMerge "Not send switch intents if there is no real intent" 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

7 years agoMerge "Not send switch intents if there is no real intent" into oc-dev
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

7 years agoMerge "Don't wtf() for reverse profile access; make it a warning." 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

7 years agoMerge "Whitelist DMAgent from bg check" into oc-dev
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

7 years agoMerge "Don't wtf() for reverse profile access; make it a warning." into oc-dev
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

7 years agoMerge "Whitelist DMAgent from bg check" 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

7 years agoMerge "Handle edge-case where the focus-search root is focused" into oc-dev
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

7 years agoMerge "Handle edge-case where the focus-search root is focused" into oc-dev
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

7 years agoIncrease visibility of FEATURE_LEANBACK_ONLY
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

7 years agoMerge "Refresh opacity and statefulness on tint change" into oc-dev
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

7 years agoMerge "Refresh opacity and statefulness on tint change" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Refresh opacity and statefulness on tint change" into oc-dev

7 years agoMerge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResp...
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

7 years agoMerge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResp...
Pankaj Kanwar [Mon, 3 Apr 2017 22:35:59 +0000 (22:35 +0000)]
Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev

7 years agoMerge "Framework support to improve bg check CTS tests." 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

7 years agoAdd some strings that will be needed for QS changes
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

7 years agoMerge "Revert "Deprecate EXTRA_STREAM."" into oc-dev
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

7 years agoMerge "Framework support to improve bg check CTS tests." into oc-dev
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

7 years agoMerge "Warn if IMM#showSoftInputUnchecked() is called" 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

7 years agoMerge "Remove/fix broken test due to change to DUMP permission check." into oc-dev
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

7 years agoMerge "Revert "Deprecate EXTRA_STREAM."" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 22:17:13 +0000 (22:17 +0000)]
Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev

7 years agoMerge "Make some intents public in SubscriptionManager." 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

7 years agoMerge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev
Yohei Yukawa [Mon, 3 Apr 2017 22:14:25 +0000 (22:14 +0000)]
Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev

7 years agoMerge "Remove/fix broken test due to change to DUMP permission check." 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

7 years agoMerge "Make some intents public in SubscriptionManager." 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

7 years agoFixing issue with activity incorrectly auto-entering PiP.
Winson Chung [Mon, 3 Apr 2017 22:04:20 +0000 (15:04 -0700)]
Fixing issue with activity incorrectly auto-entering PiP.

- When the PiP menu activity was brought forward, we were inadvertently
  setting the auto-enter supported flag for the PiP base activity as
  well, which would trigger auto-enter PiP once the activity is moved
  back to fullscreen and then subsequently finished.

Bug: 36352343
Bug: 36364010
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Id1b800bf392d03b55562fb13374e33a5ff0ebda6

7 years agoFixed NPE when FillService replies with a null FillResponse.
Felipe Leme [Mon, 3 Apr 2017 20:53:21 +0000 (13:53 -0700)]
Fixed NPE when FillService replies with a null FillResponse.

This problem was not detected by CTS tests because the exception is
"harmless" (it's just ignored), but it can be verified at logcat:

W Binder  : Caught a RuntimeException from the binder stub implementation.
W Binder  : java.lang.NullPointerException: Attempt to invoke virtual method 'android.content.IntentSender android.service.autofill.FillResponse.getAuthentication()' on a null object reference
W Binder  :  at com.android.server.autofill.ViewState.maybeCallOnFillReady(ViewState.java:159)

Bug: 35707731
Test: CtsAutoFillServiceTestCases pass
Test: manual verification
Change-Id: I58330a7e91b2c186bf97897b7d39640010ca630b

7 years agoMerge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev
Dongwon Kang [Mon, 3 Apr 2017 21:56:44 +0000 (21:56 +0000)]
Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev
am: 64731b1d41

Change-Id: Id2737cf02080ba6b9a37dffba2a7727466ae07e5

7 years agoExpose framework activities to Instant Apps
Chad Brubaker [Mon, 3 Apr 2017 21:45:23 +0000 (14:45 -0700)]
Expose framework activities to Instant Apps

Bug: 36864579
Test: Instant apps can use choosers and account picker
Change-Id: Ie8d3a019ffc91497a314b2c9d5a09f6ca5b0ba9f

7 years agoMerge "Remove workaround for end() not supported in some app" into oc-dev
Doris Liu [Mon, 3 Apr 2017 21:48:13 +0000 (21:48 +0000)]
Merge "Remove workaround for end() not supported in some app" into oc-dev
am: 33f893202d

Change-Id: I991ba78a570021ea4d7e7ac4d743225ee947a635

7 years agoMerge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 21:46:32 +0000 (21:46 +0000)]
Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev

7 years agosupport shutdown animation from bootanim
Keun-young Park [Thu, 23 Mar 2017 20:46:24 +0000 (13:46 -0700)]
support shutdown animation from bootanim

- init will set sys.powerctl property and run bootanim.
- Use /oem/media/shutdownanimation.zip or
  /system/media/shutdownanimation.zip for animation file.
  If none of them exist, android animation will be used.
- Disable audio playing for shutdown animation.
- Disable TimeCheckThread for shutdown animation. It
  accesses /data partition and can block umount.

bug: 36526187
Test: many reboots

Change-Id: If02c73cda2015317d88d056cd45201208da49946

7 years agoMerge "Remove workaround for end() not supported in some app" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 21:41:12 +0000 (21:41 +0000)]
Merge "Remove workaround for end() not supported in some app" into oc-dev

7 years agoExpose animator settings to Instant Apps
Chad Brubaker [Mon, 3 Apr 2017 21:34:50 +0000 (14:34 -0700)]
Expose animator settings to Instant Apps

Bug: 36861394
Test: Instant Apps can access the settings
Change-Id: I0e414cb068a47e9a6f62239ffcb922de54586a71

7 years agoMerge "Make Color non-final because apps break..." into oc-dev
Romain Guy [Mon, 3 Apr 2017 21:28:58 +0000 (21:28 +0000)]
Merge "Make Color non-final because apps break..." into oc-dev
am: c0c524af4f

Change-Id: Ic2d88c0a09eadd151f164b4da50c6e60df83dbbd

7 years agoMerge "Make Color non-final because apps break..." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 21:21:13 +0000 (21:21 +0000)]
Merge "Make Color non-final because apps break..." into oc-dev

7 years agoDon't wtf() for reverse profile access; make it a warning.
Makoto Onuki [Mon, 3 Apr 2017 19:48:42 +0000 (12:48 -0700)]
Don't wtf() for reverse profile access; make it a warning.

Bug:36003688
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: I6d6a73e1d9281dc0b92186dd0666865b0f6b3f1c

7 years agoMerge "Javadoc fix for View.setTooltipText" into oc-dev
Vladislav Kaznacheev [Mon, 3 Apr 2017 21:01:25 +0000 (21:01 +0000)]
Merge "Javadoc fix for View.setTooltipText" into oc-dev
am: 5219a85eaa

Change-Id: Id6a4d111411ea8e44cbc7865fc5a26f9b0c1bb31

7 years agoMerge "Javadoc fix for View.setTooltipText" into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 20:55:11 +0000 (20:55 +0000)]
Merge "Javadoc fix for View.setTooltipText" into oc-dev

7 years agoMerge "Persistent connection to DO/PO service." into oc-dev
Makoto Onuki [Mon, 3 Apr 2017 20:44:25 +0000 (20:44 +0000)]
Merge "Persistent connection to DO/PO service." into oc-dev
am: dcc792a13f

Change-Id: I05bb97b2708cab722e5dfa2807ac24f1869bb245

7 years agoMerge "Persistent connection to DO/PO service." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 20:35:14 +0000 (20:35 +0000)]
Merge "Persistent connection to DO/PO service." into oc-dev

7 years agoRevert "Deprecate EXTRA_STREAM."
Jeff Sharkey [Mon, 3 Apr 2017 20:14:10 +0000 (20:14 +0000)]
Revert "Deprecate EXTRA_STREAM."

This reverts commit a0ba51c2ab75c8e0406bbd43742597552b6dae98.

Bug: 35293781
Change-Id: I5f0b9000535ac0bcbbe125fe781c20c5fb0c8782

7 years agoRemove/fix broken test due to change to DUMP permission check.
Makoto Onuki [Mon, 3 Apr 2017 18:24:25 +0000 (11:24 -0700)]
Remove/fix broken test due to change to DUMP permission check.

Bug 36854321
Test: adb shell am instrument -e class 'com.android.server.pm.ShortcutManagerTest2' -w com.android.frameworks.servicestests

Change-Id: I80f2a326b70f8d0598246732510e3725a0c58871

7 years agomedia: unhide mediarecorder's setVideoEncodingProfileLevel api.
Hangyu Kuang [Sat, 10 Sep 2016 00:34:52 +0000 (17:34 -0700)]
media: unhide mediarecorder's setVideoEncodingProfileLevel api.

Test: GoogleCmaera app.
bug: 35151543
Change-Id: I37dee948298a14d338bca670af0bc01450c83529

7 years agoMerge "Revert "Push chooser targets to the shortcut manager."" into oc-dev
Makoto Onuki [Mon, 3 Apr 2017 19:54:24 +0000 (19:54 +0000)]
Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev
am: ef7dff2563

Change-Id: I43302d90f7aa2c174c5e31cd5390e03c3c087157

7 years agoTIF: use integer for constants instead of string
Dongwon Kang [Fri, 31 Mar 2017 19:40:20 +0000 (12:40 -0700)]
TIF: use integer for constants instead of string

Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 36395855
Change-Id: I9f0d62acb73883f543219a1ee4ed961140221a11

7 years agoTIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI
Dongwon Kang [Fri, 24 Mar 2017 00:05:38 +0000 (17:05 -0700)]
TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI

Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 35856179
Change-Id: I284cb1b764203c646e3edb3f105d90d59a7688d1

7 years agoMerge "Revert "Push chooser targets to the shortcut manager."" into oc-dev
Makoto Onuki [Mon, 3 Apr 2017 19:45:08 +0000 (19:45 +0000)]
Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev

7 years agoAddress API concerns for isConcurrentVoiceAndDataAllowed and
pkanwar [Tue, 28 Mar 2017 23:40:28 +0000 (16:40 -0700)]
Address API concerns for isConcurrentVoiceAndDataAllowed and
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
(cherry picked from commit 89731a8389c9726172989f1677b76cc0f6a96f4f)

7 years agoMerge "Fix menu visibility while updating dismiss fraction." into oc-dev
Winson Chung [Mon, 3 Apr 2017 19:26:31 +0000 (19:26 +0000)]
Merge "Fix menu visibility while updating dismiss fraction." into oc-dev
am: 3f2bbcbe92

Change-Id: I748b00c12872baa61280a20d354da49766fcf837

7 years agoMerge "Fix menu visibility while updating dismiss fraction." into oc-dev
Winson Chung [Mon, 3 Apr 2017 19:22:54 +0000 (19:22 +0000)]
Merge "Fix menu visibility while updating dismiss fraction." into oc-dev

7 years agoMerge "Add test API for if the device supports QS" into oc-dev
Jason Monk [Mon, 3 Apr 2017 19:22:35 +0000 (19:22 +0000)]
Merge "Add test API for if the device supports QS" into oc-dev
am: be436bdefe

Change-Id: Ia882b3d7e7ab25c8b1426f478adadad8432c18f2

7 years agoMerge "Add test API for if the device supports QS" into oc-dev
Jason Monk [Mon, 3 Apr 2017 19:11:36 +0000 (19:11 +0000)]
Merge "Add test API for if the device supports QS" into oc-dev

7 years agoRemove workaround for end() not supported in some app
Doris Liu [Mon, 3 Apr 2017 18:08:11 +0000 (11:08 -0700)]
Remove workaround for end() not supported in some app

BUG: 36241584
Test: Follow repro steps of comment #1 in the bug above

Change-Id: I1bf27a7cc9cc2bd398c372623d7978e838f1d8b2

7 years agoMake Color non-final because apps break...
Romain Guy [Mon, 3 Apr 2017 18:49:20 +0000 (11:49 -0700)]
Make Color non-final because apps break...

Bug: 36858735
Test: Manual run of crashing app
Change-Id: I3eb06260074ee6950bc91731e7093a26d7e32b49

7 years agoMerge "Add friction icon for metered networks." into oc-dev
Stephen Chen [Mon, 3 Apr 2017 18:40:19 +0000 (18:40 +0000)]
Merge "Add friction icon for metered networks." into oc-dev
am: 38344ac4e9

Change-Id: I4edf3bd9367de701ea3f161a0ff461d47e216186

7 years agoJavadoc fix for View.setTooltipText
Vladislav Kaznacheev [Thu, 30 Mar 2017 00:14:37 +0000 (17:14 -0700)]
Javadoc fix for View.setTooltipText

Change "unless is not handled" to "unless it is handled"

Bug: 36668465
Test: read the Javadoc
Change-Id: I432f24e313358b4448aff2ff9de382d4a58652bc

7 years agoHandle edge-case where the focus-search root is focused
Evan Rosky [Mon, 3 Apr 2017 18:37:20 +0000 (11:37 -0700)]
Handle edge-case where the focus-search root is focused

Bug: 36854948
Test: Added check to FocusFinderTest#testFindNextFocus
Change-Id: Iac6ea6e255d16d4cd1f7fe053ba47e171fff73e0

7 years agoMerge "Ensuring multi-window callbacks contain new configuration and are in order...
Winson Chung [Mon, 3 Apr 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev
am: 34ecbaa991

Change-Id: I76109d3ae5f9b6ad98860d62c889b042bb3f6562

7 years agoMerge "Fixing regression in PiP TV." into oc-dev
Winson Chung [Mon, 3 Apr 2017 18:33:50 +0000 (18:33 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev
am: 244e4854c3

Change-Id: Id0d758849c8838f9f43958e43978246b9b8c5cec

7 years agoWhitelist DMAgent from bg check
Tony Mak [Mon, 3 Apr 2017 17:39:45 +0000 (18:39 +0100)]
Whitelist DMAgent from bg check

This should be reverted before O is shipped.

Test: Found DMAgent in the whitelist in Settings.

Bug: 36856786

Change-Id: I7828566e4bc93a30457c594471fa43270c0bf3b3

7 years agoMerge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
Brad Ebinger [Mon, 3 Apr 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
am: 57132a1513

Change-Id: Ic29e989b13f2a9d4d53b403f3bdc1b1c46145e45

7 years agoMerge "Add friction icon for metered networks." into oc-dev
TreeHugger Robot [Mon, 3 Apr 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add friction icon for metered networks." into oc-dev

7 years agoMerge "Ensuring multi-window callbacks contain new configuration and are in order...
Winson Chung [Mon, 3 Apr 2017 18:23:24 +0000 (18:23 +0000)]
Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev

7 years agoMerge "Fixing regression in PiP TV." into oc-dev
Winson Chung [Mon, 3 Apr 2017 18:22:35 +0000 (18:22 +0000)]
Merge "Fixing regression in PiP TV." into oc-dev

7 years agoMerge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
Chad Brubaker [Mon, 3 Apr 2017 18:13:27 +0000 (18:13 +0000)]
Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev
am: e35d50622c

Change-Id: Ibe29b902356c271e4ca33da87ed908d427dfb46d

7 years agoMerge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
Brad Ebinger [Mon, 3 Apr 2017 18:12:37 +0000 (18:12 +0000)]
Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev

7 years agoMerge "Fix some WM unit tests" into oc-dev
Andrii Kulian [Mon, 3 Apr 2017 18:07:30 +0000 (18:07 +0000)]
Merge "Fix some WM unit tests" into oc-dev
am: 2c93764bee

Change-Id: I7d2d610f3939eac1b271e45ae35457b7b71dc46a

7 years agoMerge "Use KB instead of kB." into oc-dev
Daniel Nishi [Mon, 3 Apr 2017 18:06:19 +0000 (18:06 +0000)]
Merge "Use KB instead of kB." into oc-dev
am: e8165eb4ba

Change-Id: I33784b0f9c681dcfdc2a1f03d707336a9729ae30

7 years agoMerge "Fix deleting Misc channel for o-aps" into oc-dev
Geoffrey Pitsch [Mon, 3 Apr 2017 18:05:06 +0000 (18:05 +0000)]
Merge "Fix deleting Misc channel for o-aps" into oc-dev
am: a906fb7b43

Change-Id: I5276632980c373a0bc1861915a10cecf29b6cce1

7 years agoMerge "Expose instant app to exposed providers" into oc-dev
Todd Kennedy [Mon, 3 Apr 2017 18:03:47 +0000 (18:03 +0000)]
Merge "Expose instant app to exposed providers" into oc-dev
am: 644648ebfd

Change-Id: I32fc7de9cd1a0823dd38e5103d85c47776bb1404

7 years agoMerge "Disable sounds on menu button" into oc-dev
Jason Monk [Mon, 3 Apr 2017 18:02:26 +0000 (18:02 +0000)]
Merge "Disable sounds on menu button" into oc-dev
am: 5c8832a983

Change-Id: I16aef7e38de6a154d051f539b9fc8c96db73958a

7 years agoMerge "Fix battery icon dark initialization" into oc-dev
Jason Monk [Mon, 3 Apr 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Fix battery icon dark initialization" into oc-dev
am: cb4ed821f2

Change-Id: I34cc7adb16ec21ba8c9cf210b3ca61b2c9506290

7 years agoMerge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
George Mount [Mon, 3 Apr 2017 17:57:27 +0000 (17:57 +0000)]
Merge "Allow committing allowing state loss on detached FragmentManager." into oc-dev
am: e9679db5e2

Change-Id: I4192bc42bdc35ff29ac6e3c4ce2bb67f5a412c4b

7 years agoMerge "Fix broken perf tests" into oc-dev
Diego Perez [Mon, 3 Apr 2017 17:52:17 +0000 (17:52 +0000)]
Merge "Fix broken perf tests" into oc-dev
am: 974b5b13b2

Change-Id: Ic9442beef0e2bec7db53b8e6ef1ff47dc6d12769

7 years agoMerge "QS: Add transient animations for bluetooth and wifi" into oc-dev
Jason Monk [Mon, 3 Apr 2017 17:51:00 +0000 (17:51 +0000)]
Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
am: a56b6e530a

Change-Id: I43f7dafe192930ce5f3a78db5e586d62ba66a1c4

7 years agoMerge "Fix losing status bar icons on config changes" into oc-dev
Jason Monk [Mon, 3 Apr 2017 17:49:45 +0000 (17:49 +0000)]
Merge "Fix losing status bar icons on config changes" into oc-dev
am: f244f7e1b8

Change-Id: I08a75d88e6764703d4c450b9ee5f81a824e2adc9

7 years agoMerge "Implement service filtering" into oc-dev
Todd Kennedy [Mon, 3 Apr 2017 17:46:59 +0000 (17:46 +0000)]
Merge "Implement service filtering" into oc-dev
am: 35110948b7

Change-Id: Ie19ae7075e8fe35857a60306452fe19b06bb1848

7 years agoFix menu visibility while updating dismiss fraction.
Winson Chung [Mon, 3 Apr 2017 17:44:57 +0000 (10:44 -0700)]
Fix menu visibility while updating dismiss fraction.

Bug: 36225602
Test: Enter PIP, move, tap field to show IME
Change-Id: Idf47728a2fa40703e4e68b2cc0925167b8e80c0c