Commit Graph

313035 Commits

Author SHA1 Message Date
a6bd937c93 Merge "Fix crash when measuring storage." into oc-dev 2017-04-10 23:12:21 +00:00
c1ae9cd296 Update string description and char limits
Change-Id: Idba5977e614094c3a96b1101f1234f26433300c8
Fix: 36680364
Test: builds
2017-04-10 16:08:30 -07:00
7cf918ed2d add debug logs
Test: TreeHugger
Change-Id: I4b12acb43aa4af7a5587842fe5e2528fee8f4fed
2017-04-10 15:11:22 -07:00
4a3eda992b Fix double-detach DualTimer bug
DualTimer attempted to detach its subTimer twice when reset(true) was
called, once explicitly and once via a call to the main timer. This
fixes that problem by getting rid of the explicit detach in reset.

Bug: 37208694
Test: runtest -x
frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
and manually looked for "Removed unknown observer" error in logcat.

Change-Id: Ic5ff7d799d46236a74ab0825e108bef40bac0360
2017-04-10 14:28:00 -07:00
b706bb7e52 ignore RemoteException from pm if shutdown is already on-going
- In new shutdown flow, adb is guaranteed to be alive while system server
  is alive.
- power manager can be killed before system server is killed.
- This leads into RemoteException for shutdown request to power manager.
- If shutdown is already on-going (=sys.powerctl set), the RemoteException
  should be ignored.

bug: 37096155
Test: adb shell svc power reboot|shutdown and check output to adb
Change-Id: Ia90a900d55123bd7c1bf57c90c49d35332ebfdf5
2017-04-10 20:55:03 +00:00
aa3ee8e079 Update fontchain_lint to test new emoji font
The new emoji font has been update to Unicode 10/Emoji 5, and has a
new mechanism for flag fallbacks. It also shares glyphs between
gendered emoji and non-genders ones.

Test: make fontchain_lint passes
Bug: 34688862
Bug: 33276970
Bug: 34738377
Change-Id: I4d43b8c777deb93be1e6a784eaa109e2e7febd7d
2017-04-10 13:52:20 -07:00
4774fb36d0 Add getSelfManagedPhoneAccounts() TelecomManager API.
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.

Test: CTS
Bug: 34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
(cherry picked from commit 8931707058)
2017-04-10 20:20:47 +00:00
4a30689414 Merge "send broadcast to the right users" into oc-dev 2017-04-10 20:10:17 +00:00
a09111e745 Merge "Do not set outActivity if value is null." into oc-dev 2017-04-10 20:04:10 +00:00
3dcf031866 Remove .(ll)ndk suffix from (ll)ndk_library
Soong handles these automatically now.

Bug: 33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Change-Id: Ic10796e75bb886cc3f92c234714ab3e6c85112df
2017-04-10 12:54:37 -07:00
433d68713f Cache mEphemeralAppsDisabled state
Init mEphemeralAppsDisabled in systemReady when settings provider
is available.

Registered content observers for ENABLE_EPHEMERAL_FEATURE and
WEB_ACTION_ENABLED.

Test: manual triggering enable_ephemeral_feature=1/0
Fixes: 36869938
Fixes: 36895304
Change-Id: I0051c45bb209d86041b967a409f8a95967df21dc
2017-04-10 12:53:47 -07:00
24757146d1 Ensure the system boots with a halfway sane time/date
Just in case the kernel or vendor glue don't initialize the system time
sensibly, we now make sure the current time at boot is at least up to the
build time of the system disk image.

Bug 36736983
Test: manual

Change-Id: I46f776300ca4f5ad01396fc17c83fc833e1713f9
2017-04-10 12:44:09 -07:00
73edcd7328 Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev 2017-04-10 19:28:31 +00:00
c2ec7bf965 Merge "Fix activity move between displays" into oc-dev 2017-04-10 19:20:37 +00:00
4efa14c784 send broadcast to the right users
Change-Id: Ibda2d922cd58d6ca1c1a4ecdccaa25e5c71c6320
Fixes: 37192695
Test: manual; create restricted profile and see that users haven't been removed
2017-04-10 12:12:11 -07:00
d0f492db03 AAPT2: Share split functionality between link and optimize
Generating splits should be possible to do from the optimize command.
This means that a lot of infrastructure around split APKs can be
shared by both the optimize and link phase.

Bug: 35925830
Change-Id: Ia88b9e4bff300a56353b2f7a4a2547c8eb43a299
Test: manual
2017-04-10 11:59:18 -07:00
0015a15353 Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev 2017-04-10 18:52:00 +00:00
d401163599 Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev 2017-04-10 18:30:53 +00:00
1d8b1afeaf Do not set outActivity if value is null.
Recent changes passed down the nullable array to a method where it
was not being properly checked.

Change-Id: Ibf940f9225e4c9901869188aa55a04d0908015c3
Fixes: 37197666
Test: manual via bug repro steps.
2017-04-10 11:06:17 -07:00
415e454f55 Fix race condition in removeForegroundServiceFlag
Also fix flake in our tests.

Test: runtest systemui-notification
Fixes: 36550043
Fixes: 36551790
Change-Id: I910e9233a17ef325bcb173c50c00d9982dc72224
2017-04-10 13:52:07 -04:00
1d99079ef4 Fix READ_PHONE_NUMBERS label
Change-Id: If4a254092168d9f7b133a58b59dd946f64cefdae
Fixes:37207265
Test: builds
2017-04-10 10:48:35 -07:00
9b7a8272d8 Don't ensure config for activity that is about to be invisible
We were relaunching an activity in the docked stack that is been
dismissed because we call ensure configuration on it due to the
resize of it been moved to the fullscreen stack. This isn't needed
as the activity is about to become invisible since it is been moved
to a stack that isn't visible.
We now ensuring the configuration if:
- The stack the activity is in shouldn't be visible.
- The activity is currently stopped or stopping.

Change-Id: I6adac6b11a0db4b100e623e4074e169660206567
Fixes: 37118176
Test: Activity in docked stack isn't relaunched when dismissed.
2017-04-10 10:44:18 -07:00
c922c4827a Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev 2017-04-10 16:36:48 +00:00
0ac8fd7adb Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev 2017-04-10 15:06:10 +00:00
e9ec87d0d4 Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev 2017-04-10 14:57:49 +00:00
9c80a16c45 Merge "Update decor LayoutParams when window is already added." into oc-dev 2017-04-10 14:22:53 +00:00
e812e7dc2e Merge "AutoSize TextView - fix measurements" into oc-dev 2017-04-10 12:48:36 +00:00
4286c5768d Merge "VPN: cancel always-on notification with new id" into oc-dev 2017-04-10 12:43:36 +00:00
5f2b7992cf Tethering: support Local-only Hotspot mode for downstreams
Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 31466854

Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7
2017-04-10 21:42:16 +09:00
c9a6e75682 Merge "Fix mock of setApplicationRestrictions()" into oc-dev 2017-04-10 12:18:16 +00:00
b96891e0e3 Merge "DngCreator: Populate baseline exposure tag" into oc-dev 2017-04-10 10:04:05 +00:00
549482bfcb AutoSize TextView - fix measurements
The BoringLayout measurements for auto-size are
incorrect. Removed those and kept the StaticLayout
measurements.

Bug: 36940118
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t\
      android.widget.cts.TextViewTest

Change-Id: I772ade08ed26efac05ca56cb7df8cfec0327633b
2017-04-10 09:56:32 +00:00
446c9c9172 NetworkPolicyManagerService: fix deadlock
Callers of addNetworkPolicy() were not taking locks in the correct order
inside NetworkPolicyManagerService:
  - addNetworkPolicy() is an internal method that calls
    setNetworkPolicies which takes both mUidRulesFirstLock and
    mNetworkPoliciesSecondLock in order.
  - both callers of addNetworkPolicy, mWifiStateReceiver and
    mConnReceiver via ensureActiveMobilePolicy, were taking
    mNetworkPoliciesSecondLock before calling addNetworkPolicy.
    - this causes the order of locking to be reversed, which can cause a
    deadlock when another concurrent codepath in
    NetworkPolicyManagerService tries to take both locks in the correct
    order.

This patch fixes this issue by wrapping both problematic codepaths into
addNetworkPolicy() with a lock on mUidRulesFirstLock.

Test: build, flashed, NetworkPolicyManagerServiceTest passes
Bug: 36972283
Change-Id: If7888c11aef8b628e1b013224075c4c75eae0022
2017-04-10 09:56:23 +09:00
eca0d421d1 Merge "Fix counting problems in StopwatchTimer." into oc-dev 2017-04-09 18:54:34 +00:00
15297a67d3 VPN: cancel always-on notification with new id
Previously we used 0 for the id of the "Always-on VPN disconnected"
notification, as did many other system services. In a recent CL, an
effort was made to assign a dedicated id to each of these system
notifications. Unfortunately, this CL only changed the id in the call to
NotificationManager#notify(), but not NotificationManager#cancel(). This
causes the notification to persist even when always-on VPN is turned off
by the user.

This CL changes the id in the cancel() call, thus fixing the issue.

Bug: 37175930
Test: manually enable and disable always-on and observe the notification
Change-Id: I39c7325c78479afe3dc9e1764d54406bd721b067
2017-04-08 22:03:42 +01:00
73e510e6fa Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 08:01:11 +00:00
c2f554292e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 07:59:30 +00:00
ce1e6999a0 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 07:58:44 +00:00
99c95f8dd8 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 07:53:26 +00:00
53df9f871a Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 07:49:42 +00:00
df12f01abd Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 07:47:37 +00:00
bcc90073ce Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-08 07:42:22 +00:00
51785edbe9 Merge "Restore session on new window after app kill" into oc-dev 2017-04-08 02:35:35 +00:00
42136b209d Merge "Start service from libscheduleservicehidl." into oc-dev 2017-04-08 02:27:06 +00:00
a48a21c4a6 Import translations. DO NOT MERGE
Change-Id: I46d2b42e600a83d18ae13b2b4e55f244def1a070
Auto-generated-cl: translation import
2017-04-07 19:21:23 -07:00
72790bade5 Merge "Use feature instead of hidden config for multi-display" into oc-dev 2017-04-08 01:51:29 +00:00
89628f8809 Merge "FingerprintSettings for non-owner should respond to fingerprint touches" into oc-dev 2017-04-08 01:47:35 +00:00
ec0a1f2599 Add an API to enable disable safebrowsing in WebView
WebView safebrowsing can be opted in using a manifest value. However,
we also need to control individual WebViews.

Bug:37158813
Test: See change I71e813bccc2fab73d100384661128c7311dd396c

Change-Id: I647dc304787d6406691b5cbadf1c9a4f13ac5604
2017-04-07 18:46:18 -07:00
51c1b67022 Fix activity move between displays
1. ActivityConfigCallback might not have been registered
because DecorView was not yet attached to window and ViewRootImpl
was not available. In this CL the callback is set as soon as a
DecorView is attached to window.
2. When private display was removed from system, its stacks were
moved to bottom in AM but moved to top in WM.
3. When reparenting stack visibility of activities should be updated
before reparenting in WM, because otherwise WM will be resizing
windows that should no longer visible and reporting it to clients.

Bug: 34164473
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testOnMovedToDisplayCallback
Test: #testContentDestroyOnDisplayRemoved
Change-Id: I6ccc27d873d0d60d7650659fb25cbfcaaeb0fd07
2017-04-07 18:39:32 -07:00
4567c1a1a3 Merge "Enable profiling for system server for userdebug|eng" into oc-dev 2017-04-08 01:26:57 +00:00