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

308210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Perez
5780637259 Merge "Set MockView.setGravity to public" 2017-02-21 15:20:20 +00:00
George Mount
9659c4d646 Merge "Ensure transactions cannot be run during controller state change" 2017-02-21 15:19:03 +00:00
Philipp Weiß
c5b9bb9418 Merge "Show policy transparency dialog after failed screenshot" 2017-02-21 15:13:55 +00:00
Diego Perez
c98c16ded8 Merge "Add support for aapt:attr attributes" 2017-02-21 12:55:14 +00:00
Bryan Mawhinney
229316ad3e Merge "Revert "Move settings backup tests to own class"" 2017-02-21 10:53:03 +00:00
Bryan Mawhinney
871f47c220 Revert "Move settings backup tests to own class" 
This reverts commit a990c74b2a45a1bcc7fd3683d67009b73a24ed48.

Change-Id: I0b1bef2af10ba9b3499c69764fed125b8a25b3e9
 2017-02-21 10:51:00 +00:00
Diego Perez
67ac03043c Set MockView.setGravity to public 
The method is used from Studio so it needs to be public.

Test: N/A
Change-Id: I603de9ae0c8b719f5173eff152cc2558f734017e
 2017-02-21 10:41:18 +00:00
Bryan Mawhinney
fbf550de5a Merge "Move settings backup tests to own class" 2017-02-21 10:14:59 +00:00
Narayan Kamath
b7c4782c24 Merge "PackageParser: String interning fixes." 2017-02-21 09:47:08 +00:00
Diego Perez
bc9d2a13f0 Add support for aapt:attr attributes 
Test: Tested from the studio side
Change-Id: Id506801f53cfc976c7352bd7f9632804862668b7
 2017-02-21 09:34:49 +00:00
Diego Perez
8f52705b48 Merge "Fix BridgeContext.resolveThemeAttribute color parsing" 2017-02-21 09:30:05 +00:00
TreeHugger Robot
8dba8afc65 Merge "Suppress RescueParty when active USB connection." 2017-02-20 20:08:32 +00:00
TreeHugger Robot
586b6b2c3d Merge "Guard against possible AMS/PMS deadlock." 2017-02-20 19:57:21 +00:00
Chad Brubaker
3ed1b905c4 Merge "Use requesting userId for ApplicationInfo lookup" 2017-02-20 19:50:38 +00:00
TreeHugger Robot
27f8d6d977 Merge "Fix incorrect title in PreferenceActivity." 2017-02-20 19:30:35 +00:00
TreeHugger Robot
bde1c4a885 Merge "Revert "Modifying dpm.setSecureSetting call for install_non_market_apps"" 2017-02-20 18:50:54 +00:00
Bryan Mawhinney
a990c74b2a Move settings backup tests to own class 
And adjust blacklists to make tests pass again

Test: run FrameworksCoreTests

Change-Id: I28fa4509e23728c97c532c38842340f99487e890
 2017-02-20 18:35:37 +00:00
Jeff Sharkey
6e544617c6 Guard against possible AMS/PMS deadlock. 
PMS can't call into AMS while holding its local lock.

Test: builds, boots
Bug: 35410906
Change-Id: Ib80bbee5c0c3e5fb39ffef324e8176027da83f2f
 2017-02-20 11:02:29 -07:00
Jeff Sharkey
d9574c7bbf Suppress RescueParty when active USB connection. 
When there is a very early system server runtime restart, we may not
yet have a published BatteryManagerInternal, so we need to go directly
to the "batteryproperties" native service to detect the USB state.

Test: builds, rescue is suppressed when USB is connected
Bug: 34872406
Change-Id: I949984cb95495c77de85ac322075177cff07b8b6
 2017-02-20 10:45:27 -07:00
TreeHugger Robot
135e5aac1b Merge "Really fix regressions in IMMS#setImeWindowStatus" 2017-02-20 17:43:48 +00:00
Victor Chang
5663e05109 Revert "Modifying dpm.setSecureSetting call for install_non_market_apps" 
This reverts commit 2e7d6d64b9b16ea27634bc0e8843717a465142b4.

Bug: 35590590
Fix: 35590106
Test: runtest managed-provisioning
Test: manual verified that work profile can be inflated
Change-Id: Ie780b94053e65bca2f96b32055937c0c9e8beae8
 2017-02-20 17:00:58 +00:00
Paul Duffin
88c0facc1e Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" am: 372b6b2c45 am: 3fbcd8cf38 
am: dec65547e2

Change-Id: Icd19f7ae6a7628df97ee7e8e57d63ca51ad581cc
 2017-02-20 16:10:16 +00:00
Paul Duffin
dec65547e2 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" am: 372b6b2c45 
am: 3fbcd8cf38

Change-Id: Ie2bb70bea07f8642804cd6dc2e987e95e69ef633
 2017-02-20 16:06:03 +00:00
Paul Duffin
3fbcd8cf38 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" 
am: 372b6b2c45

Change-Id: Iafa345df241f4f713451aa42a7169eddb57eb1ea
 2017-02-20 15:59:06 +00:00
Treehugger Robot
372b6b2c45 Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" 2017-02-20 15:47:53 +00:00
Paul Duffin
0589d8287e Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue() 
The previous changes to these files, which inlined the behavior
of Assert.assertTrue() were done in a hurry to fix the build.
This change makes use of the existing Utils.assertTrue() method
that was created for this purpose.

Bug: 30188076
Test: make checkbuild
Change-Id: Iacd505f8c3f7cefe6de94d30b56e39600bb9b0af
 2017-02-20 13:27:38 +00:00
Paul Duffin
14fd9cebe9 Merge "Avoid using JUnit code in production WallpaperCropper" am: 9598c98db0 am: e4add524e9 
am: 1f2955ad0d

Change-Id: I0921dc15784c2aff6b1b1c4ce33fe8aed0eaba98
 2017-02-20 13:03:59 +00:00
Paul Duffin
1f2955ad0d Merge "Avoid using JUnit code in production WallpaperCropper" am: 9598c98db0 
am: e4add524e9

Change-Id: I8c22e84feff3fa597403a7de6300528f823268d7
 2017-02-20 12:56:22 +00:00
Paul Duffin
e4add524e9 Merge "Avoid using JUnit code in production WallpaperCropper" 
am: 9598c98db0

Change-Id: I15b0bbe22d18feca699ecaf4146dc9e2c279e5b5
 2017-02-20 12:48:55 +00:00
Narayan Kamath
07ac1442b5 PackageParser: String interning fixes. 
Stop interning string metadata values as well as class names as it's
unlikely there will be much duplication among these.

Also make sure we intern the same set of strings when parsing packages
from their cache entries as we do when parsing them from the package
itself.

This change also improves error reporting for the unit-test and fixes
a failure that was introduced by a previous change (the addition of
static libraries).

Test: PackageParserTest
Bug: 34726698

Change-Id: Ia0d0342b91b3294bd5569756255918d1dc886e05
 2017-02-20 12:40:21 +00:00
Paul Duffin
9598c98db0 Merge "Avoid using JUnit code in production WallpaperCropper" 2017-02-20 12:40:18 +00:00
Paul Duffin
c36ff4cf4f Avoid using JUnit code in production WallpaperCropper 
Bug: 30188076
Test: make checkbuild
Change-Id: Ib6fe445a246d15dbabb8b86f9251b0059ed216b5
 2017-02-20 12:37:35 +00:00
Philipp Weiß
02737595cb Merge "Remove Quicksettings footer in QuickQSPanel" 2017-02-20 12:04:20 +00:00
Jerome Gaillard
b01d3db742 Merge "Update FontFamily_Delegate following Change I1d6e1c4c" 2017-02-20 11:35:57 +00:00
Diego Perez
3d3e69ce6d Fix BridgeContext.resolveThemeAttribute color parsing 
When passed a color, resolveThemeAttribute was not parsing the value
into the .data field.

Bug: http://b.android.com/232870
Test: Added new test
Change-Id: I9d91e3a70c24f1e71d9d89977fe79b0965e98893
 2017-02-20 11:08:26 +00:00
Rubin Xu
82c2d94e89 Merge "Normalize empty credential into null" 2017-02-20 11:03:26 +00:00
TreeHugger Robot
7bde762f3b Merge "Add support for remote views backed auto-fill UI" 2017-02-20 10:59:43 +00:00
Andrei Stingaceanu
2c2c3eea8e Merge "AutoSize TextView (part 10) - final APIs" 2017-02-20 10:27:07 +00:00
Svet Ganov
00c771dc7d Add support for remote views backed auto-fill UI 
Test: CTS and manual

Change-Id: Ia09f0208d78439491052e4886a0e71c387b73370
 2017-02-20 00:37:33 -08:00
TreeHugger Robot
71fe435056 Merge "MediaSessionService: Notify volume key long-presses when the screen is off" 2017-02-20 04:06:04 +00:00
Jaewan Kim
d61a87baf0 MediaSessionService: Notify volume key long-presses when the screen is off 
When the screen is off, MediaSessionService doesn't get the volume key
long-press events from the PhoneWindowManager because PhoneWindowManager
intercepts them and only sends initial down and up events.
This is intended because users cannot see the safety warning dialog
which warns users about too loud volume.

This CL assumes that volume key is long-pressed if the key up doesn't
happen after the initial down within the long-press timeout, and notify
them with IOnVolumeKeyLongPressListener.

Bug: 35328001
Test: Manual test
Change-Id: I3b5aec4c2dd66a181bf41786f1417cc65874356c
 2017-02-20 10:57:37 +09:00
Phil Weaver
e3bf23bed9 Merge "Verify fingerprint exists before using it" 2017-02-19 04:48:19 +00:00
Colin Cross
278028e97a Merge "Revert "Remove outdated emulator check which causes BT to not start"" 2017-02-19 03:27:35 +00:00
TreeHugger Robot
827225b46d Merge "AudioService: prevent NPE on an invalid PIID" 2017-02-18 23:53:12 +00:00
TreeHugger Robot
5653fd68f9 Merge "Fix a race in persisting instant cookie" 2017-02-18 23:47:10 +00:00
Colin Cross
039deed1fd Revert "Remove outdated emulator check which causes BT to not start" 
This reverts commit d98a4e502165d76d05e095608da3c795bd56eafd.

Change-Id: Ibd1596584928f2aa2c799501536abc9b384d1cda
 2017-02-18 13:35:45 -08:00
Chad Brubaker
7fe0a5ac56 Use requesting userId for ApplicationInfo lookup 
Change-Id: I4f29f31e48d66d16181fb415fd864de2746def94
Fixes: 34771610
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
 2017-02-18 12:14:02 -08:00
Svet Ganov
312c6cc6a6 Fix a race in persisting instant cookie 
Test: CTS passes and manual too

Change-Id: I8beb7edb84e5f7e2a181a9c237d6f0f761805d70
 2017-02-17 23:41:15 -08:00
Tetsutoki Shiozawa
04215148cf Merge "Apply RTL layout to the title of ResolverActivity" am: 2122e42e9b am: add56f7b66 
am: 046194a0a7

Change-Id: Ic431cf76e498998b2b9c6d2e40ee46bd00db5a4d
 2017-02-18 06:28:47 +00:00
Colin Cross
0cbda3181f Merge "WallpaperCropper has no tests, it doesn't need junit" am: a34472b7e6 am: 11436455cf 
am: de523d80d1

Change-Id: Ib567b678baa71884b7d8b5b603cd4a9e3ced1c75
 2017-02-18 06:27:33 +00:00