Commit Graph

310966 Commits

Author SHA1 Message Date
Andreas Gampe
332dd12baa Ota: Add command logging
Log the next command.

Bug: 25612095
Test: m
Change-Id: I284a2fb3e329afcb0b03f7162585b0eefe13eb0e
2017-03-17 13:59:08 -07:00
TreeHugger Robot
ef8297e275 Merge "Send broadcast when user restrictions change." 2017-03-17 20:48:36 +00:00
Alan Viverette
d88a7ffc7c Update references to removed APIs
Test: make PRODUCT-sdk_google_aw_x86-sdk
Change-Id: I8e13f43520e609808a9825fa3c89f4233076c5a9
2017-03-17 16:48:12 -04:00
Christopher Tate
b1d6448ec4 Correctly check expired jobs against active ones
If a job was run before its deadline, and then the deadline landed
while the job was still running, b/c of the 'deadline trumps all'
it would be considered eligible to run again as soon as the previous
iteration completed.

Fix this by checking against the state of the active queue.

Bug 36253320
Test: CTS: job scheduler TimingConstraintsTest

Change-Id: I4f0c1012091bf88776cfe725d7b59f6dcf602c02
2017-03-17 13:45:20 -07:00
Brian Carlstrom
dd08db08ff Merge "Dump native stack for background ANR if process is of interest" 2017-03-17 20:33:04 +00:00
Sundeep Ghuman
ce78a5f2d3 Average scan results for AccessPoints.
This reduces jitter in the WifiTracker and is modeled after a prior
broken implementation which attempted to half-life the rssi each time
AccessPoint.update(ScanResult) is called.

Bug: 34774783
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: Iab3f9914af40f2fd56e8ae7b45dcbd62176c8a67
2017-03-17 13:29:59 -07:00
TreeHugger Robot
57efc93f08 Merge "QS: Revert change to when user switcher is shown" 2017-03-17 20:22:40 +00:00
Dan Willemsen
349907c1ad Fix libplatformproto includes/export includes
The host versions of these were pointing to the target generated
sources, without having proper dependencies added. But the build system
already handles these adding these to your local and exported include
directories, so just remove them.

Bug: 36365556
Test: m -j libhwui incident_report incident-section-gen
Change-Id: I52024508eabd8d10899c307c950fe045ff66ab25
2017-03-17 13:05:20 -07:00
Makoto Onuki
f87e234488 Merge "Fix deadlock between activity manager and settings provider" 2017-03-17 19:59:06 +00:00
Fan Zhang
51fac1237d Code clean up: remove some dead code.
Test: existing tests pass
Change-Id: I1e0e6f8218b3a6550476fe1aa092f685d7433d53
2017-03-17 12:55:21 -07:00
Alan Viverette
42b0676d61 Merge "Revert "Changing initial and default focus behavior"" 2017-03-17 19:47:13 +00:00
Sundeep Ghuman
4d8781e6be Show friction icons in Saved Networks list.
Bug: b/34802842
Test: $ make SettingsFunctionalTests -j40
$ adb install -r
$ {OUT}/data/app/SettingsFunctionalTests/SettingsFunctionalTests.apk
$ adb shell am instrument -w \
    'android.settings.functional/android.support.test.runner.AndroidJUnitRunner'

Change-Id: I0d6aedad2aabb40ef532283a755cb5c954e8139d
2017-03-17 12:44:54 -07:00
Sundeep Ghuman
b9647ebba0 Fix broken AccessPointTests.
Bug: None
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

Change-Id: I5d5da5e7e0faf1c124816f0dd8ab5f0249e54637
2017-03-17 12:44:54 -07:00
Robin Lee
2c68dadb20 Better call emulation for DevicePolicyManagerTest
Let's have several separate contexts instead of doing strange things
with package names in one monolithic context representing every single
user on the device at once, sometimes multiple times in the same call.

Syntax looks like:

        runAsCaller(callerContext, dpms, (dpm) -> {
            assertSomething(dpm.doSomething(caller, param));
        });

When a caller calls into DevicePolicyManager here's what happens:

PRE

- a new DevicePolicyManager is created with the caller context
- service context callingIdentity is saved
- the callingUid, callingPid, and callingPermissions are added to the service context

TEST

- client-side test code interacts with DevicePolicyManager using the caller context
- server-side coder under test runs as DevicePolicyManagerService using the service context

POST

- service context callingIdentity is restored to what it was before the test.

This should be easier to reason about.

Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases
Change-Id: I148e3f298b0a958639ce261e9cf91f6eb49fae4d
2017-03-17 19:44:46 +00:00
Peter Qiu
89537734e1 hotspot2: implement toString for PasspointConfiguration
Bug: 35850988
Test: Verify contents in "adb shell dumpsys"
Change-Id: Idabe65d505eb15113aba06dc05c879861b94b2af
2017-03-17 12:44:13 -07:00
Conrad Chen
96f6a1a7d6 Merge "Block modifying types of channels" 2017-03-17 19:39:44 +00:00
Evan Rosky
cfd6c85d42 Revert "Changing initial and default focus behavior"
This is a soft revert.

This reverts commit 37df2dbab1

Change-Id: I7ac08c0ef514f7ce7a0b750e501a5333f4ffb6d2
2017-03-17 12:39:15 -07:00
TreeHugger Robot
741a898514 Merge "Adding an extras Bundle to MessagingStyle messages." 2017-03-17 19:38:02 +00:00
TreeHugger Robot
13a8b79755 Merge "Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays" 2017-03-17 19:19:45 +00:00
Mårten Kongstad
c0bba8b18b Fix ArrayMap.get vs ArrayMap.valueAt typo
Replace incorrect call to ArrayMap.get with correct call
ArrayMap.valueAt.

This bug was discovered when removing an overlay from /vendor/overlay
and restarting the device. The OMS settings file still referred to the
overlay, and when the settings item was to be removed, the following
crash occurred.

*** FATAL EXCEPTION IN SYSTEM PROCESS: main
java.lang.NullPointerException: Attempt to read from field 'java.lang.String android.content.om.OverlayInfo.packageName' on a null object reference
   at com.android.server.om.OverlayManagerServiceImpl.onSwitchUser(OverlayManagerServiceImpl.java:121)
   at com.android.server.om.OverlayManagerService.onSwitchUser(OverlayManagerService.java:257)
   at com.android.server.om.OverlayManagerService.<init>(OverlayManagerService.java:237)
   at com.android.server.SystemServer.startBootstrapServices(SystemServer.java:580)
   at com.android.server.SystemServer.run(SystemServer.java:363)
   at com.android.server.SystemServer.main(SystemServer.java:238)
   at java.lang.reflect.Method.invoke(Native Method)
   at com.android.internal.os.Zygote$MethodAndArgsCaller.run(Zygote.java:226)
   at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:726)

Test: adb exec-out stop && adb exec-out rm /vendor/overlay/... && adb exec-out start
Change-Id: I341a8d6eb90555b9169e5cd7dfac87d850b72e9b
2017-03-17 12:14:45 -07:00
Robin Lee
c74d85fee8 Make SYNC_PARENT_SOUNDS a @SystemApi
Since there is a CTS test depending on it which is currently hardcoding
the string. Let's not do that.

Bug: 30658854
Test: make full -j30
Change-Id: I6f6b1044ac664589b8fe76ced9961e80024b0b29
2017-03-17 19:11:20 +00:00
Makoto Onuki
73360ab2d1 Fix deadlock between activity manager and settings provider
Test: manual
Bug 36028906

Change-Id: I20344608d79d174b468506056789c04d3bde510f
2017-03-17 11:59:45 -07:00
Jason Monk
84caab7bdb QS: Revert change to when user switcher is shown
Its making it inconsistently show up on the lock screen. Until
final behavior is decided, revert to old behavior.

Change-Id: Ifc69f2d5b527cc9ce5a174b16b8b605db26fc35b
Fixes: 36141544
Test: visual
2017-03-17 14:49:47 -04:00
Diego Perez
37ecda0eba Merge "Fix BitmapShader to work with adaptive icons" 2017-03-17 18:01:30 +00:00
TreeHugger Robot
9f7958c17f Merge "Disable large-ish parcel logging." 2017-03-17 17:57:30 +00:00
TreeHugger Robot
2fb89f45b9 Merge "Removed 'virtual' from autofill method names." 2017-03-17 17:54:37 +00:00
TreeHugger Robot
6e4075bde6 Merge "Adding enabled state for remote actions." 2017-03-17 17:51:45 +00:00
Roshan Pius
b2312cdbb6 Merge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25 am: da34226f06
am: 9205ccf3ee

Change-Id: I33a6f328a4373c323bfe1b2de59273faf5c03695
2017-03-17 17:40:54 +00:00
Roshan Pius
f817fbce16 Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632 am: 6b6f1b9e12
am: 28212c1b29

Change-Id: I478ebcd9f2d98e35a3ae408d027b67d69de79c09
2017-03-17 17:39:37 +00:00
Roshan Pius
9205ccf3ee Merge "WifiConfiguration: Correct documentation for priority" am: f5fa26bf25
am: da34226f06

Change-Id: I4b01b13b9628a06040db3a49c2e7769b837cadf6
2017-03-17 17:34:10 +00:00
Roshan Pius
28212c1b29 Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632
am: 6b6f1b9e12

Change-Id: I38ef25c794573c2a0c2817ca4e8cd1a8c2aa9250
2017-03-17 17:33:06 +00:00
Andrii Kulian
e6ac20e1c7 Allow holders of MANAGE_ACTIVITY_STACKS to launch on private displays
MANAGE_ACTIVITY_STACKS permission allows moving stacks, tasks and
activities between corresponding parents. It makes no sense to
require more strict START_ANY_ACTIVITY permission to launch on
private display, as an activity still can be moved to it.

Bug: 34164473
Test: 'adb unroot' and run android.server.cts.ActivityManagerDisplayTests
Change-Id: I3b59127829c432e42a46630025eeddd152bce1b0
2017-03-17 10:30:50 -07:00
Roshan Pius
da34226f06 Merge "WifiConfiguration: Correct documentation for priority"
am: f5fa26bf25

Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da
2017-03-17 17:28:13 +00:00
Roshan Pius
6b6f1b9e12 Merge "WifiConfiguration: Update psk documentation"
am: 89c79ff632

Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8
2017-03-17 17:26:57 +00:00
TreeHugger Robot
1c10a61a97 Merge "Allow Instant Apps access PackageInfo of exposed apps" 2017-03-17 17:26:24 +00:00
Treehugger Robot
f5fa26bf25 Merge "WifiConfiguration: Correct documentation for priority" 2017-03-17 17:18:32 +00:00
Treehugger Robot
89c79ff632 Merge "WifiConfiguration: Update psk documentation" 2017-03-17 17:17:50 +00:00
Tomasz Wasilczyk
3d19f90c32 Merge "Add getProgramList call to the broadcast radio API." 2017-03-17 16:34:55 +00:00
Jerome Gaillard
3ce947f482 Merge "Update ColorFilter_Delegate following Change I5f74addd" 2017-03-17 16:29:36 +00:00
Jeff Sharkey
f5299f1b88 Disable large-ish parcel logging.
This logging was originally added to track down very large log
messages that were causing Binder transactions to fail.  We fixed
a handful of bugs that could have been causing this over in 32575987,
so this logging should no longer be needed in live builds.  (In fact,
this logging is being triggered often enough to push other important
debugging information out of logs.)

Test: builds, boots
Bug: 36372780
Change-Id: I640192fbec35693673a2f22b7a82ce54f27937da
2017-03-17 10:25:10 -06:00
TreeHugger Robot
837c927213 Merge "Fix up QS edit UI" 2017-03-17 16:11:36 +00:00
Felipe Leme
81f01d9efd Removed 'virtual' from autofill method names.
Fixes: 36126001
Test: VirtualContainerActivityTest pass

Change-Id: I3b8fe835cd7c7f39c8e2cb8f2daca71b03236a1f
2017-03-17 09:09:31 -07:00
Neil Fuller
ff8b79e162 Merge "Track library change in libcore." am: ed9c176e16 am: 301f1d3645
am: cef08e7482  -s ours

Change-Id: Ide1ba5f3864e13376e15c561a911d5e2394328fa
2017-03-17 15:50:31 +00:00
Brian Carlstrom
66524247d4 Dump native stack for background ANR if process is of interest
Bug: 30112521
Bug: 36043456
Bug: 35241370
Test: make -j32 -k && flashall
Change-Id: I25b134ec24c534f3cfeb5a7c43195da3a6285d57
2017-03-17 08:48:52 -07:00
Roshan Pius
651b264b3d WifiConfiguration: Correct documentation for priority
Addressing the concerns raised by API council for deprecating this
field.

Bug: 35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
2017-03-17 08:44:06 -07:00
Neil Fuller
cef08e7482 Merge "Track library change in libcore." am: ed9c176e16
am: 301f1d3645

Change-Id: Ifb24866783cab6a602ac5f3dd1df705ba93d931e
2017-03-17 15:44:05 +00:00
Roshan Pius
cbd0c76ad0 WifiConfiguration: Update psk documentation
Adding some documentation to explain the expected contents of this
field.

Bug: 35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
2017-03-17 08:40:17 -07:00
Andrii Kulian
c1b59ed73e Merge "Separate global and override config sent to client" 2017-03-17 15:39:37 +00:00
Neil Fuller
301f1d3645 Merge "Track library change in libcore."
am: ed9c176e16

Change-Id: Iae6166cf055625947589b3a14b72ed7828738311
2017-03-17 15:38:01 +00:00
TreeHugger Robot
edd694e4bf Merge "Change dependency to standard mockito-target-minus-junit4" 2017-03-17 15:32:07 +00:00