308264 Commits

Author SHA1 Message Date
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
Isaac Chen
d34fac541a Turned ENABLE_CPUSETS into runtime decision.
ENABLE_CPUSETS is usually set in BoardConfig.mk to use CONFIG_CPUSETS
feature of Linux kernel.

This change turns the build time variable into runtime decision by
checking if a special file, "tasks", can be found under the mount
point, /dev/cpuset, for cpusets.

Bug: 34726944

Test: Tested on Sailfish
          without cpuset mounted
	  with cpuset mounted, but without schedtune mounted
	  with cpuset mounted and with schedtune mounted

Change-Id: I1c044c3c9d4d15360a1605e7022da84d94df4014
2017-02-18 16:42:54 +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
TreeHugger Robot
b1c820edab Merge "resolve merge conflicts of a110feee4cac to master" 2017-02-18 06:19:31 +00:00
TreeHugger Robot
0991eb2f49 Merge "Removes an already defined warning in aapt." 2017-02-18 04:40:31 +00:00
TreeHugger Robot
8ab1a6abc2 Merge "Fix a race when persisting cookie data" 2017-02-18 04:23:47 +00:00
Yohei Yukawa
bbb10e8ec0 Really fix regressions in IMMS#setImeWindowStatus
My previous CL [1] that aimed to fix Bug 35395372 was imperfect.
It just converted InvalidParameterException into NullPointerException
due to a silly mistake in a new error check.

 [1]: Ib9448c551d9a30776a999c27a5ff20f1a095633a
      ee2a7ed3d971f83134a2b28258dd2e56f9634f94

Test: Made sure Bug 35395372 and Bug 35479942 are no longer
      reproducible, that is,
      1. Flash a new image and complete the setup wizard on a
         direct-boot unaware device.
      2. Set a device password and require it upon each device boot.
      3. adb reboot
      4. Observe the default IME does not crash because of
         NullPointerException/InvalidParameterException thrown by IMMS.
Test: Made sure IMM#showSoftInputFromInputMethod(IBinder, int) does
      not throw an NullPointerException even in an extreme case.
      1. Rebuild LatinIME with the following code in LatinIME.java
       @Override
       public AbstractInputMethodImpl onCreateInputMethodInterface() {
           return new InputMethodService.InputMethodImpl() {
               @Override
               public void attachToken(IBinder token) {
                   super.attachToken(token);

                   final InputMethodManager imm =
                       getSystemService(InputMethodManager.class);
                   final IBinder imeToken =
                       getWindow().getWindow().getAttributes().token;
                   imm.showSoftInputFromInputMethod(imeToken, 0);
               }
           };
       }
      2. adb install -r LatinIME.apk
      3. adb shell ime enable com.android.inputmethod.latin/.LatinIME
      4. adb shell ime set com.android.inputmethod.latin/.LatinIME
      5. Tap any text field.
      4. Observe LatinIME does not crash because of
         NullPointerException/InvalidParameterException thrown by IMMS.
Bug: 34628091
Bug: 35079353
Fixes: 35395372
Fixes: 35479942
Change-Id: Id8e34ecb28480755e8141b6e46820b37fe3dc92b
2017-02-17 20:13:52 -08:00
Pulkit Bhuwalka
705cbc684a resolve merge conflicts of a110feee4cac to master
Test: Resolved merge conflict. Built locally.

Change-Id: If8e439d513ac2242b82f67a4c68bc3adfabe2b9c
2017-02-17 20:13:31 -08:00
TreeHugger Robot
28f99293f7 Merge "Fix Rgba16fTests@testTransferFunctionsShader test" 2017-02-18 02:59:33 +00:00
TreeHugger Robot
e453d8e762 Merge "Removing unnecessary call to ArraySet#toArray" 2017-02-18 02:48:42 +00:00
Aurimas Liutikas
75e7d1d73e Removes an already defined warning in aapt.
Apps that expect to use the current SDK don't specify anything in their
manifest and the build system rightfully injects the current SDK.

Any apps that specify their own <uses-sdk> or versionCode are telling
the build system that they are purposely using some other minSdkVersion,
etc (support library demos).

Test: None
Change-Id: I0aba3a71e15703c7bcafcf4d35608a1851dd8567
Fixes: 34901699
2017-02-17 18:44:28 -08:00
TreeHugger Robot
cf7ce6cbda Merge "Fixes issues where the PiP menu activity is out of sync." 2017-02-18 02:25:39 +00:00
TreeHugger Robot
e8430fd574 Merge "Shared library test case addition" 2017-02-18 02:19:16 +00:00