Commit Graph

27890 Commits

Author SHA1 Message Date
Chris Tate
02ffbf039f Merge "Correctly check expired jobs against active ones" 2017-03-18 00:39:59 +00:00
Brian Carlstrom
02a2813ad2 Merge "Warn when ActivityManagerService.dumpStackTraces times out" 2017-03-18 00:39:51 +00:00
TreeHugger Robot
dd1997bc9c Merge "Getting ephemeral flag from PackageManager when UidRecord is null" 2017-03-17 23:25:19 +00:00
Calin Juravle
072082d617 Merge "Compile secondary dex files according to REASON_BACKGROUND_DEXOPT" 2017-03-17 23:22:55 +00:00
Adam Lesinski
10eb1455b9 Merge changes from topic 'configForSplit'
* changes:
  libandroidfw: Search all packages for an identifier
  AAPT2: Finish support for feature splits
  Add support for configForSplit
2017-03-17 23:19:13 +00:00
Android Build Merger (Role)
cdf3dc290b Merge "Merge "Ota: Add command logging" am: 9a8d78dc86 am: 8dd991a7ef am: c47f92b374" 2017-03-17 23:12:05 +00:00
Andreas Gampe
789a3e82cb Merge "Ota: Add command logging" am: 9a8d78dc86 am: 8dd991a7ef
am: c47f92b374

Change-Id: I6038dc9afd05c375bd1c6933b2aa5882f7835174
2017-03-17 23:11:11 +00:00
TreeHugger Robot
a5ccbd9993 Merge "Fix ArrayMap.get vs ArrayMap.valueAt typo" 2017-03-17 23:07:31 +00:00
Andreas Gampe
c47f92b374 Merge "Ota: Add command logging" am: 9a8d78dc86
am: 8dd991a7ef

Change-Id: I7a5061a98c33abbae787a42079c41263dbcdc7cb
2017-03-17 22:53:33 +00:00
Andreas Gampe
8dd991a7ef Merge "Ota: Add command logging"
am: 9a8d78dc86

Change-Id: I48b887a26c8f8123c112559da0f74112bb703b1c
2017-03-17 22:45:34 +00:00
Suprabh Shukla
834b66c479 Getting ephemeral flag from PackageManager when UidRecord is null
When a user switches off background running for an app that was already
stopped, UidRecord is null when passed in to
AcitivityManager#doStopUidLocked resulting in an NPE. We need to get
ephemeral state flag from package manager in such cases.

Test: Manual

Bug: 36158380
Change-Id: Id77848c252cc0ff0c803113ac2c7c19aa0dcf254
2017-03-17 14:29:08 -07:00
Brian Carlstrom
7bdfe5cdd1 Warn when ActivityManagerService.dumpStackTraces times out
Test: Insert hang into art/runtime/signal_catcher.cc after "reacting to signal"
Bug: 35962833
Change-Id: Ia5444e7e23b3fc34f233ce8cc083d44b284a6cdc
2017-03-17 14:26:57 -07:00
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
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
Makoto Onuki
f87e234488 Merge "Fix deadlock between activity manager and settings provider" 2017-03-17 19:59:06 +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
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
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
TreeHugger Robot
1c10a61a97 Merge "Allow Instant Apps access PackageInfo of exposed apps" 2017-03-17 17:26:24 +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
Neil Fuller
cef08e7482 Merge "Track library change in libcore." am: ed9c176e16
am: 301f1d3645

Change-Id: Ifb24866783cab6a602ac5f3dd1df705ba93d931e
2017-03-17 15:44:05 +00: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
ed9c176e16 Merge "Track library change in libcore." 2017-03-17 15:28:35 +00:00
TreeHugger Robot
1d33b07f44 Merge "Removing 'delegate' from constant names" 2017-03-17 14:48:15 +00:00
Julia Reynolds
f619bc5211 Removing 'delegate' from constant names
Change-Id: I2ac4e3ae08f1084da34ea74fdd5177e2d58987af
Fixes: 35812334
Test: build
2017-03-17 08:43:22 -04:00
Neil Fuller
01a3ff1238 Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.

Bug: 31008728
Test: make
Merged-In: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
Change-Id: I40b725a97ae2bc258b1fd4b2312b6c60ff83fe64
2017-03-17 11:57:59 +00:00
Neil Fuller
9408983ba7 Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.

Bug: 31008728
Test: make
Change-Id: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
2017-03-17 11:53:05 +00:00
Joel Scherpelz
5e1eb40c8f Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am: 52f8421b77 am: b8933942fc
am: f9cd5cd81b

Change-Id: I5ebbe1a63da43f28b0d582bc7e6480ffe74195b7
2017-03-17 03:05:45 +00:00
Joel Scherpelz
f9cd5cd81b Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am: 52f8421b77
am: b8933942fc

Change-Id: Ic1b6226da3cfb68eeb352c1f81df09733ab52e4d
2017-03-17 02:59:11 +00:00
Joel Scherpelz
b8933942fc Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
am: 52f8421b77

Change-Id: I5b5d5460f9fe7ed228ab32b2c63cb601be5e1edb
2017-03-17 02:53:11 +00:00
Karthik Ravi Shankar
e6ccc3e816 Merge "Add API to get compatibility display id" 2017-03-17 02:34:07 +00:00
Andrii Kulian
446079600e Separate global and override config sent to client
There is some flakiness in View#onConfigurationChanged callback -
if ViewRootImpl receives config update earlier than ActivityThread,
it may not detect the configuration change and skip inner updates.
Also now ViewRootImpl assumes that it receives the global config as
a param, but instead it gets merged config from WM. This means that
ViewRootImpl#sConfigCallbacks was sending incorrect values to the
recipients.

This CL switches to sending global and override configuration to the
client separately. Also in case if there is a corresponding activity,
it first updates it and waits for update callback to ViewRootImpl.
This way global config and override config for activity will always
be set first and resources will be updated before inner state of
ViewRootImpl is updated.

Bug: 35870157
Bug: 34164473
Test: android.server.cts.ActivityManagerDisplayTests
Test: testOnMovedToDisplayCallback
Change-Id: Ic9e7541cf25ecfac6ec90e48f7efb0ece91f657e
2017-03-16 19:13:02 -07:00
Chad Brubaker
06ca1e0873 Allow Instant Apps access PackageInfo of exposed apps
Instant Apps can only see apps that explicitly expose a component via
android:visibleToInstantApp.

Bug: 34087569
Test: cts-tradefed run commandAndExit cts-dev -m
CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Ibcba43597f545966abc883e90008369fb20d61ae
2017-03-16 18:42:00 -07:00
TreeHugger Robot
85fcc0bde8 Merge "IBiometricsFingerprint uses "default" service name" 2017-03-17 01:19:51 +00:00
TreeHugger Robot
bdc813a6ea Merge "Change vold cryptkeeper permissions to be more sensible" 2017-03-17 01:15:11 +00:00
Calin Juravle
a70b1b1203 Compile secondary dex files according to REASON_BACKGROUND_DEXOPT
Test: adb shell cmd package bg-dexopt-job works for sercondary dex files

Bug: 32871170
Bug: 26719109
Change-Id: Iaee8071449c83e774b2fe331aaccfc5433856f4f
2017-03-16 18:05:31 -07:00
Yifan Hong
d8f3fe9421 Merge "Start android.frameworks.sensorservice@1.0 in system_server" 2017-03-17 00:58:14 +00:00
Joel Scherpelz
25870a2c9e Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces
This patch tries to change accept_ra_rt_info_max_plen to 64 from its
default value of 0 on kernels that support router advertisements with
route information options. The code fails silently on older unsupported
platforms.

Also factor existing startIPv6() code into a self documenting function
enableInterfaceIpv6PrivacyExtensions()

Bug: 33333670
Test: as follows
    - build sailfish
    - flashed
    - booted
    - runtest frameworks-net passes
    - runtest frameworks-wifi passes

Change-Id: I10ec83b9e04836089477d74417b7222499820066
2017-03-17 09:41:43 +09:00
Fyodor Kupolov
ef1ab44024 Merge "Handle stopped users in onCleanupUser" 2017-03-17 00:14:03 +00:00
Andrew Zeng
18a8af21b5 Merge "Fix NPE in LockSettingsService." into cw-f-dev am: 4aff3d53ef am: a01e2212c8
am: d4e88e2642

Change-Id: Ie7d409e8ef3ec5c3201bcaf0ae125ca71dc10c08
2017-03-16 23:52:44 +00:00
Andrew Zeng
d4e88e2642 Merge "Fix NPE in LockSettingsService." into cw-f-dev am: 4aff3d53ef
am: a01e2212c8

Change-Id: Id333403e3a989e233a97760b716055b3abd186d6
2017-03-16 23:40:09 +00:00
Andrew Zeng
a01e2212c8 Merge "Fix NPE in LockSettingsService." into cw-f-dev
am: 4aff3d53ef

Change-Id: I17880622c489df79eeea5116b3afe3c462b06554
2017-03-16 23:22:05 +00:00
Tadashi G. Takaoka
576de9fb77 Merge "Add has-feature shell command to PackageManagerService" 2017-03-16 23:17:15 +00:00
TreeHugger Robot
cd1c654af1 Merge "Dont send broadcasts to manifest-receivers in IA" 2017-03-16 23:16:34 +00:00
Makoto Onuki
e72f81b64d Send broadcast when user restrictions change.
- Send UserManager.ACTION_USER_RESTRICTIONS_CHANGED, which is a runtime receiver
only broadcast.

Bug 36355208

Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsDevicePolicyManagerTestCases -t 'com.android.cts.devicepolicy.UserRestrictionsTest#testUserRestrictions_deviceOwnerOnly'
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsDevicePolicyManagerTestCases -t 'com.android.cts.devicepolicy.UserRestrictionsTest#testUserRestrictions_primaryProfileOwnerOnly'
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsDevicePolicyManagerTestCases -t 'com.android.cts.devicepolicy.UserRestrictionsTest#testUserRestrictions_secondaryProfileOwnerOnly'
Change-Id: Ifd82e39ce2c08ed5accdf017f4a1ea3af6face63
2017-03-16 15:51:11 -07:00
Adam Lesinski
1665d0f028 Add support for configForSplit
Applications with the android:isolatedSplits="true" attribute in
their AndroidManifest.xml would have their Split APKs loaded in
isolation of each other, based on a set of dependencies.

Configuration Splits generated for a Feature split would not be properly
loaded before, so this change, along with a tools change, fixes this
issue and completes support for isolatedSplits.

Bug: 30999713
Test: CTS test coming (depends on some tool changes)
Change-Id: Ia4e7b0e69168a9d6637867558e306f7031720fb3
2017-03-16 15:45:10 -07:00