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

313373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
38edfd49a1 Merge "Load IA resolver settings from resolver package" 2017-04-03 23:15:36 +00:00
Alan Viverette
111f8509ea Merge "Refresh opacity and statefulness on tint change" into oc-dev am: 265dbc1f09 
am: 1148bc819a

Change-Id: I76faf6d25666c1b5612c009cfd9081465f319589
 2017-04-03 23:06:43 +00:00
Alan Viverette
1148bc819a Merge "Refresh opacity and statefulness on tint change" into oc-dev 
am: 265dbc1f09

Change-Id: Ie5a0ab7ff9f107ef386d9d5dae6b30bfbd93b6f6
 2017-04-03 22:57:11 +00:00
TreeHugger Robot
265dbc1f09 Merge "Refresh opacity and statefulness on tint change" into oc-dev 2017-04-03 22:47:32 +00:00
Pankaj Kanwar
59f9be9e69 Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev am: 37bbb789af 
am: a3c05485db

Change-Id: Iec17862e992d1597741d376dabcbf602aef72923
 2017-04-03 22:47:22 +00:00
Pankaj Kanwar
a3c05485db Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev 
am: 37bbb789af

Change-Id: I5181ea040e2406c9b7bc2bb8c16f2b1a8d35946e
 2017-04-03 22:41:17 +00: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
Pankaj Kanwar
37bbb789af Merge "Address API concerns for isConcurrentVoiceAndDataAllowed and OnReceiveUssdResponseCallback." into oc-dev 2017-04-03 22:36:03 +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
Makoto Onuki
0303797e1b Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev am: 6a7a967b71 
am: eeb6197d39

Change-Id: Ief58d7cf855babdda0ae0a0933051ee8a1ee2b53
 2017-04-03 22:30:19 +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
Makoto Onuki
eeb6197d39 Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev 
am: 6a7a967b71

Change-Id: I7b8cba52ec500fb789171d4dd97e467a8b926bfa
 2017-04-03 22:23:35 +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
TreeHugger Robot
6a7a967b71 Merge "Remove/fix broken test due to change to DUMP permission check." into oc-dev 2017-04-03 22:13:34 +00:00
Sanket Padawe
9077faab1f Merge "Make some intents public in SubscriptionManager." into oc-dev 2017-04-03 22:10:29 +00:00
Joseph Pirozzo
95daa00f31 Merge "Bluetooth Multi Connect" 2017-04-03 22:09:54 +00:00
Dongwon Kang
c83a1628a2 Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev am: 64731b1d41 
am: 2e7a92f1a5

Change-Id: I1a7ab67424478c92ab879a39b3b54aeb31ee9f95
 2017-04-03 22:07:47 +00:00
TreeHugger Robot
757796a12e Merge "Add AvailableVirtualKeyboardFragment to TV" 2017-04-03 22:04:22 +00:00
Dongwon Kang
2e7a92f1a5 Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev 
am: 64731b1d41

Change-Id: Id2737cf02080ba6b9a37dffba2a7727466ae07e5
 2017-04-03 21:56:44 +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
64731b1d41 Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev 2017-04-03 21:46:37 +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
Romain Guy
713604726e Merge "Make Color non-final because apps break..." into oc-dev am: c0c524af4f 
am: 97497985ad

Change-Id: Id10b82a9f6e6092a121a3fb35b28ff120b35b86f
 2017-04-03 21:36:32 +00:00
Romain Guy
97497985ad Merge "Make Color non-final because apps break..." into oc-dev 
am: c0c524af4f

Change-Id: Ic2d88c0a09eadd151f164b4da50c6e60df83dbbd
 2017-04-03 21:28:58 +00:00
Jesse Evans
d431093490 Load IA resolver settings from resolver package 
Changes the logic of getEphemeralResolverSettingsLPr() to resolve
a settings component in any of the packages whitelisted to provide
the instant apps installer.

Test: Boots

Bug: 36840581
Change-Id: Iac5e3dfa2cb97a630092212322f9c983c2d29926
 2017-04-03 14:23:26 -07:00
TreeHugger Robot
c0c524af4f Merge "Make Color non-final because apps break..." into oc-dev 2017-04-03 21:21:18 +00: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
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
7a41511805 Merge "Fix error in RenderNode unit test with Skia pipeline" 2017-04-03 20:56:48 +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
c4361e34ad 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
 2017-04-03 13:00:39 -07: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
Dongwon Kang
70fb40c17a TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI 
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 35856179
Change-Id: I284cb1b764203c646e3edb3f105d90d59a7688d1
 2017-04-03 12:51:52 -07:00
Makoto Onuki
ef7dff2563 Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev 2017-04-03 19:45:18 +00:00
pkanwar
95941f7c97 Address API concerns for isConcurrentVoiceAndDataAllowed and 
OnReceiveUssdResponseCallback.

Bug: 35766890
Test: Existing tests.
Change-Id: I1ddbdadafa2611edb0ecfce53d5cf32434e5236c
(cherry picked from commit 89731a8389c9726172989f1677b76cc0f6a96f4f)
 2017-04-03 19:39:42 +00:00
Winson Chung
c1935cc849 Merge "Fix menu visibility while updating dismiss fraction." into oc-dev am: 3f2bbcbe92 
am: 04475bfa2c

Change-Id: I011e86072a521775547c11563e08276b04d1f933
 2017-04-03 19:34:41 +00:00