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

313449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ajay Panicker
c2c4efd137 Make sure that the device name is not null before returning it 
Bug: 30948380
Test: Pair a device
Change-Id: I1b5610c85d6e74cec89fab0db3db281938a05a8c
 2017-04-03 20:21:14 +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
Hangyu Kuang
9ef7fe43c9 media: unhide mediarecorder's setVideoEncodingProfileLevel api. 
Test: GoogleCmaera app.
bug: 35151543
Change-Id: I37dee948298a14d338bca670af0bc01450c83529
 2017-04-03 12:56: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
f9bbac1daf TIF: use integer for constants instead of string 
Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 36395855
Change-Id: I9f0d62acb73883f543219a1ee4ed961140221a11
 2017-04-03 12:51:53 -07: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
Andrii Kulian
cd09799339 Update display contents when metrics change 
There are two separate overrides for display metrics in DisplayManager
and WindowManager:
- In DM - LogicalDisplay#mOverrideDisplayInfo, in most cases not null.
- In WM - DisplayContent#mBaseDisplayWidth/Height/Density, different
from #mInitialDisplayWidth/Height/Density values when some metrics are
forced.

When display was resized its windows weren't updated because of
two problems: old LogicaDisplay#mOverrideDisplayInfo was preventing
WM from detecting the change and override (base) display metrics were
never updated by resize.

When display size changes:
- Before this CL:
DM receives DISPLAY_CHANGED event, it updates internal values and
WM is notified about them with a message. In most cases there is an
override obtained from WM and WM doesn't get new values from
LogicalDisplay#getDisplayInfoLocked().

- With this CL:
WM will requests real updated values from DM without any overrides
and will decide whether to apply them or not: if there is no override
in WM - it will apply values from WM, otherwise it will keep the
override. Also it will always update initial display metrics if there
is a real change detected.

Bug: 35258051
Bug: 34164473
Bug: 36518752
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testDisplayResize
Test: #testForceDisplayMetrics
Change-Id: I2495c27797f11f9aaee4ea06648a8ccd29ac5b62
 2017-04-03 19:45:14 +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
Android Build Merger (Role)
3131f63b02 Merge "Merge "Add test API for if the device supports QS" into oc-dev am: be436bdefe am: b3963766c6" 2017-04-03 19:28:59 +00:00
TreeHugger Robot
8fb699ada1 Merge "add temporary cast to allow Skia roll" 2017-04-03 19:28:03 +00:00
Jason Monk
9f37fa92e0 Merge "Add test API for if the device supports QS" into oc-dev am: be436bdefe 
am: b3963766c6

Change-Id: I9601140fb9d24cec74d3c028240acaa1b7d0113d
 2017-04-03 19:27:26 +00:00
Winson Chung
04475bfa2c Merge "Fix menu visibility while updating dismiss fraction." into oc-dev 
am: 3f2bbcbe92

Change-Id: I748b00c12872baa61280a20d354da49766fcf837
 2017-04-03 19:26:31 +00:00
Winson Chung
3f2bbcbe92 Merge "Fix menu visibility while updating dismiss fraction." into oc-dev 2017-04-03 19:22:57 +00:00
Jason Monk
b3963766c6 Merge "Add test API for if the device supports QS" into oc-dev 
am: be436bdefe

Change-Id: Ia882b3d7e7ab25c8b1426f478adadad8432c18f2
 2017-04-03 19:22:35 +00:00
Jason Monk
be436bdefe Merge "Add test API for if the device supports QS" into oc-dev 2017-04-03 19:11:44 +00:00
Doris Liu
ae570c04c0 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
 2017-04-03 18:53:55 +00:00
Stephen Chen
2c003df34e Merge "Add friction icon for metered networks." into oc-dev am: 38344ac4e9 
am: aa0b33f065

Change-Id: Ib9da5f27610bd131dcd10ab12cb2d493023cbe14
 2017-04-03 18:51:46 +00:00
Romain Guy
bae8b52c71 Make Color non-final because apps break... 
Bug: 36858735
Test: Manual run of crashing app
Change-Id: I3eb06260074ee6950bc91731e7093a26d7e32b49
 2017-04-03 11:51:11 -07:00
Winson Chung
79804e6b94 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev am: 34ecbaa991 
am: 0ed0b685b4

Change-Id: I925a568a4bde9eaab06b227690094c6099b7dfff
 2017-04-03 18:47:49 +00:00
Stephen Chen
aa0b33f065 Merge "Add friction icon for metered networks." into oc-dev 
am: 38344ac4e9

Change-Id: I4edf3bd9367de701ea3f161a0ff461d47e216186
 2017-04-03 18:40:19 +00:00
Vladislav Kaznacheev
671a9701c9 Javadoc fix for View.setTooltipText 
Change "unless is not handled" to "unless it is handled"

Bug: 36668465
Test: read the Javadoc
Change-Id: I432f24e313358b4448aff2ff9de382d4a58652bc
 2017-04-03 18:39:05 +00:00
Winson Chung
950a9ef5b5 Merge "Fixing regression in PiP TV." into oc-dev am: 244e4854c3 
am: 3152f5b4e6

Change-Id: Ie53f7c78709d5b71bf26d746d1c0966b8afc5fbd
 2017-04-03 18:37:57 +00:00
Evan Rosky
e55f4a611e Handle edge-case where the focus-search root is focused 
Bug: 36854948
Test: Added check to FocusFinderTest#testFindNextFocus
Change-Id: Iac6ea6e255d16d4cd1f7fe053ba47e171fff73e0
 2017-04-03 11:37:20 -07:00
Brad Ebinger
0f7e7c59f4 Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev am: 57132a1513 
am: 6f4841bd3b

Change-Id: I73d709b8763c0859b13c621d530d5614d93c8ca2
 2017-04-03 18:36:51 +00:00
Winson Chung
0ed0b685b4 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev 
am: 34ecbaa991

Change-Id: I76109d3ae5f9b6ad98860d62c889b042bb3f6562
 2017-04-03 18:36:26 +00:00
Winson Chung
3152f5b4e6 Merge "Fixing regression in PiP TV." into oc-dev 
am: 244e4854c3

Change-Id: Id0d758849c8838f9f43958e43978246b9b8c5cec
 2017-04-03 18:33:50 +00:00
Tony Mak
ea00f16c85 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
 2017-04-03 19:29:51 +01:00
Brad Ebinger
6f4841bd3b Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev 
am: 57132a1513

Change-Id: Ic29e989b13f2a9d4d53b403f3bdc1b1c46145e45
 2017-04-03 18:25:48 +00:00
Chad Brubaker
d6ce1adabf Merge "Rename READ_PHONE_NUMBER to READ_PHONE_NUMBERS" into oc-dev am: e35d50622c 
am: a8c068f723

Change-Id: Id57b91b68ce6a4e1f31e8670798b59b82593ea96
 2017-04-03 18:25:36 +00:00
TreeHugger Robot
38344ac4e9 Merge "Add friction icon for metered networks." into oc-dev 2017-04-03 18:24:02 +00:00
Andrii Kulian
5a63cdf50d Merge "Fix some WM unit tests" into oc-dev am: 2c93764bee 
am: 45d534bf93

Change-Id: Ia81653887fbf9a712d0ed285fa91a0e3afe1bff6
 2017-04-03 18:23:58 +00:00
Winson Chung
34ecbaa991 Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev 2017-04-03 18:23:31 +00:00
Daniel Nishi
f0676e0538 Merge "Use KB instead of kB." into oc-dev am: e8165eb4ba 
am: 2444e42e1c

Change-Id: Ic43b71522c28cdd2e7c73e7406f972b623bc4d54
 2017-04-03 18:22:54 +00:00
Winson Chung
244e4854c3 Merge "Fixing regression in PiP TV." into oc-dev 2017-04-03 18:22:41 +00:00
Geoffrey Pitsch
4e3f31aab5 Merge "Fix deleting Misc channel for o-aps" into oc-dev am: a906fb7b43 
am: 635e4efa1c

Change-Id: I97ca05aff7bea5d0d99d19d29d17bdc00c8381be
 2017-04-03 18:21:57 +00:00
Todd Kennedy
0028a66c73 Merge "Expose instant app to exposed providers" into oc-dev am: 644648ebfd 
am: 58672aba18

Change-Id: I2a2b87d9203c55a905ec2dc5585a87b4fedbde98
 2017-04-03 18:20:55 +00:00
Jason Monk
a34c1bec7b Merge "Disable sounds on menu button" into oc-dev am: 5c8832a983 
am: 3184cfce76

Change-Id: Ibeab08999de0480fe4dd7ca287996a9395df84e7
 2017-04-03 18:19:46 +00:00
Jason Monk
686328c460 Merge "Fix battery icon dark initialization" into oc-dev am: cb4ed821f2 
am: 17e605aae8

Change-Id: I31c58ac77e4df9e32958659519229467a82d2f08
 2017-04-03 18:18:41 +00:00