drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
313,474 Commits 1 Branch 0 Tags
Commit Graph

75791 Commits

Author SHA1 Message Date
Philip P. Moltmann
872c968c0d Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev am: c56defe9c0 
am: b0ed6b837e

Change-Id: I7cef506e23205de73d337b54979ed9f59d283495
 2017-04-04 02:13:00 +00:00
Philip P. Moltmann
b0ed6b837e Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev 
am: c56defe9c0

Change-Id: I1f35ccc57b721fc72fdb22f0bd98c9436b1570e8
 2017-04-04 02:05:16 +00:00
Andrii Kulian
8623f89c32 Merge "Update display contents when metrics change" into oc-dev am: d6f0b0fc4f 
am: de938b99fc

Change-Id: I5420f04c0d3f910ad1db3e0e5266e26de0c6f3f7
 2017-04-04 02:00:22 +00:00
TreeHugger Robot
c56defe9c0 Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev 2017-04-04 01:57:23 +00:00
Andrii Kulian
de938b99fc Merge "Update display contents when metrics change" into oc-dev 
am: d6f0b0fc4f

Change-Id: I808ab4d68954773ba8c8691478d9fe47e1e2378f
 2017-04-04 01:49:35 +00:00
Daniel Cardenas
a66371e9be Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev am: d017221a52 
am: dbcf5279ad

Change-Id: Ia98eaa934f9be88cbec1410555e35c773f6e4ff8
 2017-04-04 01:47:15 +00:00
Andrii Kulian
d6f0b0fc4f Merge "Update display contents when metrics change" into oc-dev 2017-04-04 01:38:25 +00:00
Daniel Cardenas
dbcf5279ad Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev 
am: d017221a52

Change-Id: Icf9271e418052931ca15c3a7727f01cfedd044c9
 2017-04-04 01:38:16 +00:00
TreeHugger Robot
d017221a52 Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev 2017-04-04 01:28:43 +00:00
Hugo Benichi
d95470fa53 Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev am: df9cf5450c 
am: 83f89047f5

Change-Id: I36ec48b9b8095cd407e5b56771227714cfec66db
 2017-04-04 01:05:54 +00:00
Hugo Benichi
83f89047f5 Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev 
am: df9cf5450c

Change-Id: I7d7b66cc1dc6888ea28e2b4d83d570fa440c29f2
 2017-04-04 00:58:02 +00:00
Hugo Benichi
df9cf5450c Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev 2017-04-04 00:50:24 +00:00
Chad Brubaker
820ab35913 Merge "Expose animator settings to Instant Apps" into oc-dev am: d490fe0372 
am: fb095d897f

Change-Id: I9e28019f15b57a636df0d9881fb03e61813374c6
 2017-04-04 00:35:02 +00:00
Chad Brubaker
fb095d897f Merge "Expose animator settings to Instant Apps" into oc-dev 
am: d490fe0372

Change-Id: I3a88cc331949e987462aca315e7f396d5491147b
 2017-04-04 00:31:01 +00:00
TreeHugger Robot
d490fe0372 Merge "Expose animator settings to Instant Apps" into oc-dev 2017-04-04 00:23:34 +00:00
Makoto Onuki
6483c2d5fa Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev am: 5fd39fad26 
am: d6da0d25cb

Change-Id: Iac4bdaf66a661218eca4a562646e4867998b5cab
 2017-04-03 23:47:26 +00:00
Makoto Onuki
d6da0d25cb Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev 
am: 5fd39fad26

Change-Id: I5b81cd880d505d8525a6210525c2b9c0c09b57a0
 2017-04-03 23:38:55 +00:00
TreeHugger Robot
5fd39fad26 Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev 2017-04-03 23:32:00 +00:00
Evan Rosky
1025620ed5 Merge "Handle edge-case where the focus-search root is focused" into oc-dev am: fe9ce65491 
am: 654281bcd1

Change-Id: Ib31d0bb871cebdf963b119ef90921922a5b51b08
 2017-04-03 23:24:33 +00:00
Evan Rosky
654281bcd1 Merge "Handle edge-case where the focus-search root is focused" into oc-dev 
am: fe9ce65491

Change-Id: I8232e1313e9e9babb152fcd03f1e6e224a979e52
 2017-04-03 23:17:45 +00:00
Evan Rosky
fe9ce65491 Merge "Handle edge-case where the focus-search root is focused" into oc-dev 2017-04-03 23:10:56 +00:00
Daniel Cardenas
c40afac294 Increase visibility of FEATURE_LEANBACK_ONLY 
Bug: 36003137
Test: Build on Fugu and CTS
Change-Id: Iab9be686a004c5c0d1fae02a33898f7ebb264b27
 2017-04-03 16:06:40 -07:00
Dianne Hackborn
859a452353 Merge "Framework support to improve bg check CTS tests." into oc-dev am: 78e8ac9c14 
am: 13f9bb4c0a

Change-Id: I14c6dcd5f6328e700d1a6f5c059020767732bc6b
 2017-04-03 22:37:12 +00:00
Jeff Sharkey
010358f60d Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev am: a73aee4cdc 
am: 39561fa9a9

Change-Id: I6031f36aa31679a143b66e7f7eced1b468648de7
 2017-04-03 22:32:14 +00:00
Dianne Hackborn
13f9bb4c0a Merge "Framework support to improve bg check CTS tests." into oc-dev 
am: 78e8ac9c14

Change-Id: Ibc14492d2ce3cf312f7478a6f6edaf383d26f657
 2017-04-03 22:32:11 +00:00
Yohei Yukawa
f3956983a6 Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev am: 1061992733 
am: 7f5b18356c

Change-Id: I44a3d6e304270fa1d53953aac0eaf8d42d748615
 2017-04-03 22:31:13 +00:00
Jeff Sharkey
39561fa9a9 Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev 
am: a73aee4cdc

Change-Id: I6b1bfbc5365906b0e8eb7a058fdda01297ef4c56
 2017-04-03 22:26:03 +00:00
TreeHugger Robot
78e8ac9c14 Merge "Framework support to improve bg check CTS tests." into oc-dev 2017-04-03 22:26:01 +00:00
Yohei Yukawa
7f5b18356c Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev 
am: 1061992733

Change-Id: Ief8593eb666c0162fa30753471112f2ab64f1e38
 2017-04-03 22:24:34 +00:00
Sanket Padawe
cfbec2293f Merge "Make some intents public in SubscriptionManager." into oc-dev am: 9077faab1f 
am: a374081697

Change-Id: I68cac494b2cae5217657098672a49ce99a6feca4
 2017-04-03 22:23:28 +00:00
TreeHugger Robot
a73aee4cdc Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev 2017-04-03 22:17:17 +00:00
Sanket Padawe
a374081697 Merge "Make some intents public in SubscriptionManager." into oc-dev 
am: 9077faab1f

Change-Id: I5cfb95fd6965c58adfb86e4a607123b648d10b24
 2017-04-03 22:16:54 +00:00
Yohei Yukawa
1061992733 Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev 2017-04-03 22:14:28 +00:00
Sanket Padawe
9077faab1f Merge "Make some intents public in SubscriptionManager." into oc-dev 2017-04-03 22:10:29 +00:00
Doris Liu
b1e357f247 Merge "Remove workaround for end() not supported in some app" into oc-dev am: 33f893202d 
am: f27cf9cb9a

Change-Id: Ib0af0d8db932c33842b3a71ec0040a1fe7d9061e
 2017-04-03 21:54:52 +00:00
Doris Liu
f27cf9cb9a Merge "Remove workaround for end() not supported in some app" into oc-dev 
am: 33f893202d

Change-Id: I991ba78a570021ea4d7e7ac4d743225ee947a635
 2017-04-03 21:48:13 +00:00
TreeHugger Robot
33f893202d Merge "Remove workaround for end() not supported in some app" into oc-dev 2017-04-03 21:41:16 +00:00
Chad Brubaker
91d2e2832c Expose animator settings to Instant Apps 
Bug: 36861394
Test: Instant Apps can access the settings
Change-Id: I0e414cb068a47e9a6f62239ffcb922de54586a71
 2017-04-03 14:34:50 -07:00
Vladislav Kaznacheev
8ac5321ac0 Merge "Javadoc fix for View.setTooltipText" into oc-dev am: 5219a85eaa 
am: 595fdd7dc5

Change-Id: I40654a7e3c9d3f35fecb727cb9669a67f6910415
 2017-04-03 21:08:50 +00:00
Makoto Onuki
3cc7cd1c18 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
 2017-04-03 14:04:11 -07:00
Vladislav Kaznacheev
595fdd7dc5 Merge "Javadoc fix for View.setTooltipText" into oc-dev 
am: 5219a85eaa

Change-Id: Id6a4d111411ea8e44cbc7865fc5a26f9b0c1bb31
 2017-04-03 21:01:25 +00:00
TreeHugger Robot
5219a85eaa Merge "Javadoc fix for View.setTooltipText" into oc-dev 2017-04-03 20:55:15 +00:00
Makoto Onuki
82a67cad95 Merge "Persistent connection to DO/PO service." into oc-dev am: dcc792a13f 
am: 24e1ad4001

Change-Id: Ia90400628ca9313f7ec2326a7c0967fe01e1cc6e
 2017-04-03 20:49:51 +00:00
Makoto Onuki
24e1ad4001 Merge "Persistent connection to DO/PO service." into oc-dev 
am: dcc792a13f

Change-Id: I05bb97b2708cab722e5dfa2807ac24f1869bb245
 2017-04-03 20:44:25 +00:00
TreeHugger Robot
dcc792a13f Merge "Persistent connection to DO/PO service." into oc-dev 2017-04-03 20:35:18 +00:00
Jeff Davidson
9bcef123f4 Merge "Squashed merge of master-sim into master." 2017-04-03 20:26:59 +00:00
Jeff Sharkey
81aebe7c3c Revert "Deprecate EXTRA_STREAM." 
This reverts commit a0ba51c2ab75c8e0406bbd43742597552b6dae98.

Bug: 35293781
Change-Id: I5f0b9000535ac0bcbbe125fe781c20c5fb0c8782
 2017-04-03 20:14:34 +00:00
Makoto Onuki
b3f05c90a1 Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev am: ef7dff2563 
am: be3ee7ee30

Change-Id: I13a0dd37dfb4475866535abb514aa4a8dcd2f6a6
 2017-04-03 20:01:58 +00:00
Makoto Onuki
be3ee7ee30 Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev 
am: ef7dff2563

Change-Id: I43302d90f7aa2c174c5e31cd5390e03c3c087157
 2017-04-03 19:54:24 +00:00
Makoto Onuki
ef7dff2563 Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev 2017-04-03 19:45:18 +00:00