OSDN Git Service

android-x86/frameworks-base.git
5 years agoVisualizer: fix native crash when visualizer release
zengjing [Sat, 29 Sep 2018 05:19:15 +0000 (13:19 +0800)]
Visualizer: fix native crash when visualizer release

Visualizer should not be destroyed before mCaptureThread exit.

Bug: 124833084
Test: CTS VisualizerTest
Change-Id: I0cda2ff2be8ce487e10b5311fbdc043fa57d91d4
Merged-In: I0cda2ff2be8ce487e10b5311fbdc043fa57d91d4
Signed-off-by: zengjing <zengjing@xiaomi.com>
5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 21 Feb 2019 18:42:40 +0000 (18:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Skip empty slice permissions files during backup" into pi-dev
Daniel Sandler [Thu, 21 Feb 2019 18:27:45 +0000 (18:27 +0000)]
Merge "Skip empty slice permissions files during backup" into pi-dev

5 years agoMerge "Make notifications from the default dialer and SMS app unblockable." into...
Daniel Sandler [Thu, 21 Feb 2019 18:27:36 +0000 (18:27 +0000)]
Merge "Make notifications from the default dialer and SMS app unblockable." into pi-dev

5 years agoMerge "Clarify WebResourceResponse's stream handling." into pi-dev
TreeHugger Robot [Thu, 21 Feb 2019 04:32:58 +0000 (04:32 +0000)]
Merge "Clarify WebResourceResponse's stream handling." into pi-dev

5 years agoMerge "Improve the performance when loading image wallpaper colors" into pi-dev
Lucas Dupin [Wed, 20 Feb 2019 20:26:25 +0000 (20:26 +0000)]
Merge "Improve the performance when loading image wallpaper colors" into pi-dev

5 years agoMerge "Override old alarms in zen schedule" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 20:09:39 +0000 (20:09 +0000)]
Merge "Override old alarms in zen schedule" into pi-dev

5 years agoMerge "Update VPN capabilities when its underlying network set is null." into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 19:39:41 +0000 (19:39 +0000)]
Merge "Update VPN capabilities when its underlying network set is null." into pi-dev

5 years agoUpdate VPN capabilities when its underlying network set is null.
Varun Anand [Wed, 6 Feb 2019 18:13:38 +0000 (10:13 -0800)]
Update VPN capabilities when its underlying network set is null.

Previously, they were only updated when underlying network set was
non-null.

This change also ensures that all the calls b/w ConnectivityService and
Vpn that leads to updating capabilities are on ConnectivityService
handler thread.

Additionally, it also ensures that capabilities are propagated after VPN
enters connected state.

This change also updates VPN capabilities inline from
ConnectivityService handler thread. Previously, there was an additional
loop where Vpn would update capabilities via NetworkAgent thru
AsyncChannel which posts back to CS handler thread, which could
potentially lead to delays in updating VPN capabilities.

Bug: 119129310
Bug: 118856062
Bug: 124268198
Test: atest FrameworksNetTests
Test: manual - verified VPNs capabilities are getting updated and
DownloadManager is working correctly.

(cherry picked from commit 4fa80e8a2f03557221e0371a987e780df7788faa)

Change-Id: Iae5f2024b19df04c31938815b52687781d016cde
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Feb 2019 17:50:43 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0dbe18bb869d94b281c80f9514a99f5fdb35a089

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 17:19:48 +0000 (17:19 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:25:17 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:20:24 +0000 (16:20 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 16:14:10 +0000 (16:14 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Feb 2019 12:22:27 +0000 (04:22 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id0e3afb74226f19cf422bdc5e33455a195676055

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Feb 2019 07:57:32 +0000 (23:57 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I1e9a93f1b40f89db42865246b67fdea660184808

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Feb 2019 07:23:09 +0000 (23:23 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I106603e2d97492c9c95bab4e6b65ccb6d040ee9c

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:45:28 +0000 (03:45 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Feb 2019 03:39:48 +0000 (19:39 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idb887c01b8b6d9dd1fbb282306d2b140e65c50eb

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:35:07 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:30:10 +0000 (03:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:27:17 +0000 (03:27 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:25:36 +0000 (03:25 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:24:46 +0000 (03:24 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:24:18 +0000 (03:24 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:23:28 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:15:27 +0000 (03:15 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 20 Feb 2019 03:14:37 +0000 (03:14 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoMerge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev
TreeHugger Robot [Tue, 19 Feb 2019 22:45:16 +0000 (22:45 +0000)]
Merge "[DO NOT MERGE] AML: Handle NoDisplayActivities correctly" into pi-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 22:40:06 +0000 (14:40 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I01b16b7e400b569350aad675ab5f75bd28dac24c

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 22:05:27 +0000 (14:05 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ieee5c947030f588c5f8a8a153e2c42661342d60f

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 21:31:17 +0000 (13:31 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idb5d5034ebd53ffc67f8628b74be7a53f58aa7d3

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 20:56:46 +0000 (12:56 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6743c980549e1620354ea082664333e8612c28e0

5 years agoMake notifications from the default dialer and SMS app unblockable.
Dan Sandler [Tue, 20 Nov 2018 02:36:13 +0000 (21:36 -0500)]
Make notifications from the default dialer and SMS app unblockable.

OEM devices should overlay this resource to match the
built-in dialer and messaging client.

Bug: 119563448
Test: manual, on aosp
Change-Id: I94ff199741040e637f91e7b1db36208ab5c79182
(cherry picked from commit f5a8f213822754f65344c4e013c7574ddfdd18d0)

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 20:22:45 +0000 (12:22 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6db2d08a67d01afeb8d22beaaf24d7548b88fdda

5 years agoOverride old alarms in zen schedule
Beverly [Tue, 14 Aug 2018 18:58:18 +0000 (14:58 -0400)]
Override old alarms in zen schedule

Change-Id: I371a586d470e3e341a42fb5ae3b8f32929214c18
Merged-in: I371a586d470e3e341a42fb5ae3b8f32929214c18
Fixes: 112493468
Test: ScheduleCalendarTest
(cherry picked from commit 4e76191a9f6e3aa7ddfb158e3e97994d6ca562b8)

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 20:07:54 +0000 (12:07 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I16612db31b21037fb7f56d8b34d84df0c7e37cf1

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 19:32:44 +0000 (11:32 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ieb2802240cd7e1f91014579d3367d9f6bf2d152c

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 18:58:10 +0000 (10:58 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I3d9dd70565d27f7af23d3828508e4d44f840e91d

5 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 19 Feb 2019 18:23:58 +0000 (10:23 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0286c19387a614103c795956a2f6b4e672ff4133

5 years agoMerge "Update keyguard charging text to indicate wireless" into pi-dev
TreeHugger Robot [Tue, 19 Feb 2019 18:02:30 +0000 (18:02 +0000)]
Merge "Update keyguard charging text to indicate wireless" into pi-dev

5 years agoImprove the performance when loading image wallpaper colors
wilsonshih [Wed, 13 Feb 2019 04:20:01 +0000 (12:20 +0800)]
Improve the performance when loading image wallpaper colors

When SystemUI start up, ColorExtractor will get wallpaper colors so
status bar can use it to update theme, however, this will also block
SystemUI start up process if the wallpaper is image wallpaper.
In order to break the latency, we can extract getWallpaperColors
method from ColorExtractor's contructor, and do it at another thread,
so it won't block SystemUI start up.

Bug: 124279857
Test: atest ColorExtractorTest
Test: Manual test change theme feature can work normally.
Merged-In: I8589b28a17b0a2b33b4bbbda2265080af983f26a
Change-Id: I8589b28a17b0a2b33b4bbbda2265080af983f26a

5 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 18 Feb 2019 19:58:21 +0000 (11:58 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iac677129e3b4f27cb4db6bf5ce21d921a9f45116

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Feb 2019 10:35:23 +0000 (02:35 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I225416157c786e316deb115552412a72118b9122

5 years agoUpdate keyguard charging text to indicate wireless
Beverly [Mon, 11 Feb 2019 18:58:27 +0000 (13:58 -0500)]
Update keyguard charging text to indicate wireless

- Keyguard charging text indicates the device is wirelessly charging

Test: manual
Change-Id: I9cce8ecaf07f8870164d9ef8a569fcf30db69d85
Merged-in: I9cce8ecaf07f8870164d9ef8a569fcf30db69d85
Fixes: 124084552

5 years agoMerge "RESTRICT AUTOMERGE Close TextClassifier native resources." into pi-dev
TreeHugger Robot [Thu, 14 Feb 2019 16:22:18 +0000 (16:22 +0000)]
Merge "RESTRICT AUTOMERGE Close TextClassifier native resources." into pi-dev

5 years agoMerge "Fixed temporary brightness getting stuck bug." into pi-dev
TreeHugger Robot [Wed, 13 Feb 2019 15:34:31 +0000 (15:34 +0000)]
Merge "Fixed temporary brightness getting stuck bug." into pi-dev

5 years agoMerge "Added hysteresis check to screen brightness." into pi-dev
TreeHugger Robot [Wed, 13 Feb 2019 15:31:32 +0000 (15:31 +0000)]
Merge "Added hysteresis check to screen brightness." into pi-dev

5 years agoMerge "Do not load xml metadata for unchanged packages in RegisteredServicesCache...
Zhi An Ng [Tue, 12 Feb 2019 19:23:30 +0000 (19:23 +0000)]
Merge "Do not load xml metadata for unchanged packages in RegisteredServicesCache" into pi-dev

5 years agoDo not load xml metadata for unchanged packages in RegisteredServicesCache
Ng Zhi An [Thu, 24 Jan 2019 21:45:57 +0000 (13:45 -0800)]
Do not load xml metadata for unchanged packages in RegisteredServicesCache

RegisteredServicesCache caches services in an xml, so the system doesn't
have to scan all the apks. Whenever a package is changed
(add/remove/replaced), the broadcast receiver in RegisteredServicesCache
will refresh this cache by quering all matching services and reading
their
xml metadata. There is extra work done here, because only the changed
package
will have services added/removed.

The edge case is after a cache is invalidated, we want to query package
manager for everything, regardless of what changedUids is (we could
have arrived here if invalidateCache is called, and then a package
change event fires, before a getAllServices is called to rescan
everything).

Add a new test to verify that the optimization takes care of the case
when the cache is invalidated.

Bug: 117755076
Bug: 122912184
Test: atest RegisteredServicesCache
Test: dumpsys content # check sync adapters
Merged-In: I5c1f57108c4b67d24b198000d57216c63d35290a
Change-Id: I5c1f57108c4b67d24b198000d57216c63d35290a

5 years agoMerge "DO NOT MERGE Add CarrierConfig to overlay incorrect country ISO" into pi-dev
Allen Su [Sun, 10 Feb 2019 10:29:35 +0000 (10:29 +0000)]
Merge "DO NOT MERGE Add CarrierConfig to overlay incorrect country ISO" into pi-dev

5 years agoRESTRICT AUTOMERGE Close TextClassifier native resources.
Abodunrinwa Toki [Tue, 22 Jan 2019 21:42:56 +0000 (21:42 +0000)]
RESTRICT AUTOMERGE Close TextClassifier native resources.

Bug: 122904322
Test: atest android.view.textclassifier.TextClassificationManagerTest
Test: (MANUAL)
      1. Start an app with a TextView
      2. Select the text to trigger the text selection toolbar and TextClassifier
      3. Close the app's activity by repeatedly clicking back on the nav bar
      4. Start a Profiler for the app and observe for memory growth
      5. Repeat 1 - 3 several times and observe.
         If the bug still exists, memory should grow at about 4 - 5MB.
 If the bug is fixed, Memory should remain about the same across activity restarts.

Change-Id: Id9a60dea85cf3949de030042537287ddb29842a2

5 years ago[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device....
Abodunrinwa Toki [Fri, 8 Feb 2019 01:49:47 +0000 (17:49 -0800)]
[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device. am: 7c8a46e0dd -s ours am: 67722b0557 -s ours
am: 447f279010 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb681c28fce1178d35aecd26591d3744bf85e0df

5 years ago[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device....
Abodunrinwa Toki [Fri, 8 Feb 2019 01:43:56 +0000 (17:43 -0800)]
[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device. am: 7c8a46e0dd -s ours
am: 67722b0557 -s ours
am skip reason: change_id I360250a5c2a92d09c8d8f559b51c74f490f70c2c with SHA1 9796a1bd00 is in history

Change-Id: I7a33224747c5eb233032dfa905112067d2c61c39

5 years ago[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device.
Abodunrinwa Toki [Fri, 8 Feb 2019 01:38:52 +0000 (17:38 -0800)]
[automerger skipped] DO NOT MERGE No smart text assist for unprovisioned device.
am: 7c8a46e0dd -s ours
am skip reason: change_id I360250a5c2a92d09c8d8f559b51c74f490f70c2c with SHA1 9796a1bd00 is in history

Change-Id: I431250313c81a1aee082503e3b39798ff4e5056e

5 years agoBe more comprehensive about boot time RTC check
Christopher Tate [Tue, 11 Dec 2018 22:55:19 +0000 (14:55 -0800)]
Be more comprehensive about boot time RTC check

If we detect that the RTC is uninitialized at boot time, we advance
to the nearest safe estimated time that we can determine.  We can't
necessarily touch read/write filesystems at this point, so we have
been using the timestamp of the root filesystem.  Unfortunately, on
retail devices that timestamp is often artificial, and quite far in
the past by today's standards (e.g. some time in 2009).

We now consult a variety of milestones to get a better estimate for
the latest possible "the current date cannot be earlier than this"
reference point:  the root filesystem timestamp, the Build.TIME
system variable, and the [ro.build.date.utc] system property if
available.  The latter two, in particular, are typically within
at most two years of the current real time/date, rather than the
eight or nine years of offset that we see with the root filesystem
timestamp.

This is a cherrypick of a later change back to Android P.

Test: manually boot with system time forced to the 0 epoch
Test: CTS
Bug: 65354678
Bug: 63711349
Bug: 122883482
Merged-In: I36bbe6dfebba79ad83ce536917d6893427a026dd
Change-Id: I36bbe6dfebba79ad83ce536917d6893427a026dd

5 years agoDO NOT MERGE No smart text assist for unprovisioned device.
Abodunrinwa Toki [Wed, 28 Jun 2017 01:49:07 +0000 (02:49 +0100)]
DO NOT MERGE No smart text assist for unprovisioned device.

Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit FrameworksCoreTests:android.widget.TextViewActivityMoutseTest
Bug: 120866126
Bug: 62745625
Merged-In: I360250a5c2a92d09c8d8f559b51c74f490f70c2c
Change-Id: I360250a5c2a92d09c8d8f559b51c74f490f70c2c

5 years agoMerge "Add closing div tag for ContentResolver javadoc" into pi-dev
TreeHugger Robot [Mon, 4 Feb 2019 19:38:42 +0000 (19:38 +0000)]
Merge "Add closing div tag for ContentResolver javadoc" into pi-dev

5 years agoMerge "Use the correct Smart Storage flag in SettingsLib." into pi-dev
Daniel Nishi [Fri, 1 Feb 2019 20:44:53 +0000 (20:44 +0000)]
Merge "Use the correct Smart Storage flag in SettingsLib." into pi-dev

5 years agoFixed temporary brightness getting stuck bug.
Dan Gittik [Wed, 30 Jan 2019 17:46:25 +0000 (17:46 +0000)]
Fixed temporary brightness getting stuck bug.

When the user would set the brightness to the same value, the
temporary brightness would remain applied, effectively disabling
auto-brightness and confusing the system state.

Test: Drag the slider to an extremity (e.g. maximum), let it go, and
      then re-drag the slider to the same place (e.g. place your finger
      on the middle of the slider and move it to the maximum again).
      run adb shell dumpsys display | grep mAppliedTemporaryBrightness
      to check whether temporary brightness is applied; should be false.

Change-Id: I819ef2dc04e0cbabc4a210bd0703e0eeab157b93
Merged-In: Id3a1bff533b1bee9ca760e742dab379eeeb4b14e
Fixes: 122554527

5 years agoAdded hysteresis check to screen brightness.
Dan Gittik [Wed, 30 Jan 2019 17:31:34 +0000 (17:31 +0000)]
Added hysteresis check to screen brightness.

Previously, the AutoBrightnessController would suppress updates if
the ambient brightness hasn't changed enough, to avoid minor changes
that wouldn't really matter but probably annoy the user.
However, if the brightness curve was rather flat, a large change in
the ambient brightness might translate to a small and unnecessary
change in the screen brightness that would still get applied. So,
this CL adds similar hysteresis checks for the screen brightness.

Test: manual - simulate an ambient brightness that would cause a
      minor change in the screen brightness, and make sure it is
      suppressed (and the appropriate logs are emitted).

Change-Id: I7c229028d216c56a0fe4fb2a38ea65bed2e6906a
Merged-In: I41aefb5a9a82c9b598cf31f374f338899ffc9b11
Fixes: 122162842

5 years agoDO NOT MERGE Add CarrierConfig to overlay incorrect country ISO
allenwtsu [Fri, 4 Jan 2019 03:37:44 +0000 (11:37 +0800)]
DO NOT MERGE Add CarrierConfig to overlay incorrect country ISO

The issues happens when CDMA is roaming to GSM, some US operator's mcc/mnc would change to 204/04
whose country belongs to NL not US. It doesn't always change but error occurs once changed.
MMSService would check if locale matches with phoneNumber.
The error results in HTTP header bringing incorrect MDN to server.
In Q, AOSP fixes it by using CarrierConfig to enforce 'US' as iso-country for all error scenarios.
Since the change is great, migrating all the patches to P for the time being is risky.
So, we use the same CarrierConfig as Q and narrow the range to MMS only.
That's why we use "DO NOT MERGE".

Bug: 120448454
Bug: 122332763
Test: Build pass
Change-Id: I74a7be348f37c06c015c50f96fbcf7db4fb15246

5 years agoMerge "v3 keys use SP800 derivation" into pi-dev
TreeHugger Robot [Tue, 29 Jan 2019 21:53:43 +0000 (21:53 +0000)]
Merge "v3 keys use SP800 derivation" into pi-dev

5 years agoMerge "[DO NOT MERGE]Add check for slot index value" into pi-dev
Andy Chou [Tue, 29 Jan 2019 12:28:47 +0000 (12:28 +0000)]
Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev

5 years agoMerge "[DO NOT MERGE] ViewRoot: Notify app when surface is released from setWindowSto...
TreeHugger Robot [Tue, 29 Jan 2019 05:11:47 +0000 (05:11 +0000)]
Merge "[DO NOT MERGE] ViewRoot: Notify app when surface is released from setWindowStopped" into pi-dev

5 years agoUse the correct Smart Storage flag in SettingsLib.
Daniel Nishi [Thu, 10 Jan 2019 23:40:23 +0000 (15:40 -0800)]
Use the correct Smart Storage flag in SettingsLib.

Previously, the show_opt_in and enabled flags were conflated to
basically mean the same thing. Because we are now distinctly making
show_opt_in refer to showing a toggle to opt into the feature in SUW and
enabled to mean the default enabled status, we need to change the
utility method for querying the default enabled status.

Bug: 122461924
Test: RunSettingsLibRoboTests
Change-Id: I9802d307597d90514e7dc6631998daa1d2fab253
Merged-In: I9802d307597d90514e7dc6631998daa1d2fab253

5 years ago[DO NOT MERGE]Add check for slot index value
Michele [Wed, 23 Jan 2019 12:15:20 +0000 (04:15 -0800)]
[DO NOT MERGE]Add check for slot index value

Verify that slot index passed in setAllowedCarrier() and in
getAllowedCarrier() has a valid value or return error code.

Bug: 123097251
Test: compilation
Change-Id: I58e5447f2232d6aa096ddb7a8594d762ca74d22f

5 years ago[DO NOT MERGE] AML: Handle NoDisplayActivities correctly
Vishnu Nair [Mon, 28 Jan 2019 17:30:08 +0000 (09:30 -0800)]
[DO NOT MERGE] AML: Handle NoDisplayActivities correctly

There is a race when trying to determine if the launching activity is a trampoline activity or if
its a NoDisplay activity that will never draw on screen.

If the activity becomes invisible, its visible state in ActivityRecord may not change to invisible
before the activity finishes. This is a quick fix to also check if ActivityRecord is finishing to
determine if the activity is no longer visible.

Bug: 80380150
Test: atest CtsActivityManagerDeviceTestCases:ActivityMetricsLoggerTests
Change-Id: I55251f03db7390d6a3465eff851c4635680a2e07

5 years agoMerge "Fix theme cannot change due to there is no wallpaper colors." into pi-dev
TreeHugger Robot [Mon, 28 Jan 2019 02:51:26 +0000 (02:51 +0000)]
Merge "Fix theme cannot change due to there is no wallpaper colors." into pi-dev

5 years agoAdd closing div tag for ContentResolver javadoc
Ng Zhi An [Fri, 25 Jan 2019 05:39:24 +0000 (21:39 -0800)]
Add closing div tag for ContentResolver javadoc

Bug: 123290414
Test: m docs and manually verify
Change-Id: Ibb159678c9e3538b186fe936ab2369b6fe6fb51d

5 years ago[DO NOT MERGE] ViewRoot: Notify app when surface is released from setWindowStopped
Vishnu Nair [Thu, 24 Jan 2019 21:01:24 +0000 (13:01 -0800)]
[DO NOT MERGE] ViewRoot: Notify app when surface is released from setWindowStopped

NativeActivities do not receive onNativeWindowDestroyed callback when the activity is stopped. If
the app still uses the window object after the window is destroyed, the app can crash.

Test: run native-plasma from Android NDK. Launch activity & press home. Verify from the logs app
receives onNativeWindowDestroyed callback when its stopped.
Test: go/wm-smoke

Bug: b/111948775, b/120100553
Change-Id: I1de76feb7f4974b77b42b56e592ff6444713c699
(cherry picked from commit e626d58c1b0d09c10d7b5992f5860f7158589ddd)

5 years agoKeep PluginManager reference to avoid NPE
Lucas Dupin [Fri, 16 Nov 2018 19:31:33 +0000 (11:31 -0800)]
Keep PluginManager reference to avoid NPE

Test: manual
Change-Id: Ie7ff3eca7a9a02afff0a12d64ec8e40f136ed8d4
Fixes: 118969577
(cherry picked from commit c8a01350d3961e8eb0f49a5d9247fc633da2cb44)

5 years agov3 keys use SP800 derivation
Paul Crowley [Wed, 28 Nov 2018 20:48:16 +0000 (12:48 -0800)]
v3 keys use SP800 derivation

Bug: 118759220
Test: set up lockscreen on Marlin device
Merged-In: Ia5bdc9acaa8d37605088abcfb0037581eb6494c2
Change-Id: Ia5bdc9acaa8d37605088abcfb0037581eb6494c2

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 21 Jan 2019 03:18:22 +0000 (03:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 Jan 2019 17:52:21 +0000 (09:52 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id47c94e66f496b1f9b77d2a8289db1cd87305ccc

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sat, 19 Jan 2019 15:30:27 +0000 (15:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 19 Jan 2019 14:04:11 +0000 (06:04 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2f3f1646e9214c754874bd2a4c3642682fd5b204

5 years agoWebView: clean up onReceivedSslError docs
Nate Fischer [Fri, 18 Jan 2019 05:27:45 +0000 (21:27 -0800)]
WebView: clean up onReceivedSslError docs

No change to logic, only docs.

This adds {@link}'s for references to SslErrorHandler methods, improving
readability. This also clarifies this API is only called for recoverable
errors.

Fixes: 123042566
Test: m offline-sdk-docs
Change-Id: I0e94c9903e638e2fce59f35ec76eb5566e7ad875

5 years agoMerge "Don't log account name on logcat (cherry-pick from master)" into pi-dev
Makoto Onuki [Thu, 17 Jan 2019 17:56:25 +0000 (17:56 +0000)]
Merge "Don't log account name on logcat (cherry-pick from master)" into pi-dev

5 years agoMerge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" into...
TreeHugger Robot [Wed, 16 Jan 2019 09:08:44 +0000 (09:08 +0000)]
Merge "BluetoothManagerService: catch NoSuchElementException for unlinkToDeath" into pi-dev

5 years agoFix theme cannot change due to there is no wallpaper colors.
wilsonshih [Mon, 14 Jan 2019 04:42:35 +0000 (12:42 +0800)]
Fix theme cannot change due to there is no wallpaper colors.

Device theme cannot changed because there is no wallpaper colors when
first boot with default image wallpaper. We can still calculate it
if there is no cropFile with the wallpaper component is ImageWallpaper.

Fix: 122660786
Test: manual test.
Test: atest WallpaperColorsTest WallpaperManagerTest WallpaperServiceTest

Change-Id: I26cc1d751dadd28185c650eff6e6ef60d5986aaa

5 years agoDon't log account name on logcat (cherry-pick from master)
Makoto Onuki [Tue, 15 Jan 2019 17:34:05 +0000 (09:34 -0800)]
Don't log account name on logcat (cherry-pick from master)

Test: manual test
- dumpsys content still shows accounts
- logcat doesn't show account names after "adb shell requestsync"
Bug: 121987496

Change-Id: I853c9b77cbb331eb5138f0f774365f405f321fd2
Merged-In: Ic4b8448d10936c9368b1aab208ae7d8e78c3a1ae

5 years agoMerge "AdapterService: Only bind HeadsetService in ON state." into pi-dev
TreeHugger Robot [Tue, 15 Jan 2019 22:34:37 +0000 (22:34 +0000)]
Merge "AdapterService: Only bind HeadsetService in ON state." into pi-dev

5 years agoMerge "Actually use listener hints?" into pi-dev
Julia Reynolds [Tue, 15 Jan 2019 18:02:07 +0000 (18:02 +0000)]
Merge "Actually use listener hints?" into pi-dev

5 years agoActually use listener hints?
Julia Reynolds [Thu, 3 Jan 2019 19:35:38 +0000 (14:35 -0500)]
Actually use listener hints?

Mute notifications based on their audio attributes
if HINT_HOST_DISABLE_NOTIFICATION_EFFECTS or
HINT_HOST_DISABLE_CALL_EFFECTS is enabled.

Test: atest
Change-Id: I6404eecdce17f390154b3bafee7aa4d18a8ca5b2
Merged-In: db7081e30a6c2d369caeb5b1d26cc00aff788db3
Fixes: 120505040
(cherry picked from commit db7081e30a6c2d369caeb5b1d26cc00aff788db3)

5 years agoSkip empty slice permissions files during backup
Dan Sandler [Thu, 10 Jan 2019 16:24:19 +0000 (11:24 -0500)]
Skip empty slice permissions files during backup

Test: adb shell bmgr backupnow --monitor-verbose android
  (make sure this finishes quickly & does not get stuck
  in an infinite loop)
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/slice
Change-Id: Ieb701c7ed764c005c8a8517a9411edd8c36023f0
Fixes: 120904478
(cherry picked from commit e731681f4f1d013bfcca6158d69b67c1ad455572)

5 years agoMerge changes from topic "b/121448199" into pi-dev
Howard Yen [Tue, 15 Jan 2019 03:55:00 +0000 (03:55 +0000)]
Merge changes from topic "b/121448199" into pi-dev

* changes:
  Make sure mCurrentUsbFunctionsRequested flag be updated currectly
  Check for preexisting flag before enabling the gadget

5 years agoMerge "Fix stuck notifications" into pi-dev
TreeHugger Robot [Tue, 15 Jan 2019 01:10:33 +0000 (01:10 +0000)]
Merge "Fix stuck notifications" into pi-dev

5 years agoFix stuck notifications
Julia Reynolds [Thu, 13 Sep 2018 19:53:11 +0000 (15:53 -0400)]
Fix stuck notifications

Don't tell listeners about changes to enqueued notifications;
they'll pick up the changes in the post notification runnable.

Change-Id: I56c4ba79bcf42c30ad9a0da936eb0b774a6f3f08
Merged-In: I56c4ba79bcf42c30ad9a0da936eb0b774a6f3f08
Fixes: 74236718
Test: runtest systemui-notification

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 13 Jan 2019 05:20:57 +0000 (21:20 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I38e9b6203709ba448cccf1ae74f8308c16119f54

5 years agoClarify WebResourceResponse's stream handling.
Torne (Richard Coles) [Thu, 10 Jan 2019 20:08:57 +0000 (15:08 -0500)]
Clarify WebResourceResponse's stream handling.

Explicitly state in the documentation that the WebView will call
InputStream.close() after it's finished reading the response from a
WebResourceResponse.

Fixes: 122665050
Test: m offline-sdk-docs
Change-Id: I933c58e335ff1af31db6b4f959316ee389359e01

5 years agoMerge "Nullify the default wallpaper component if it does not exist" into pi-dev
TreeHugger Robot [Fri, 11 Jan 2019 03:36:19 +0000 (03:36 +0000)]
Merge "Nullify the default wallpaper component if it does not exist" into pi-dev

5 years ago[automerger skipped] [automerger] Select only preinstalled Spell Checker Services...
Guliz Tuncay [Fri, 11 Jan 2019 01:09:56 +0000 (17:09 -0800)]
[automerger skipped] [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c am: 3c2abaa4da am: 04206067b9 -s ours
am: cf8145858c -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1 dd8b0a6bc8 is in history

Change-Id: Ia33298579013130b2d3394fd670345e5a25c3f65

5 years ago[automerger skipped] [automerger] Revert "Select only preinstalled Spell Checker...
Bryan Ferris [Fri, 11 Jan 2019 01:00:34 +0000 (17:00 -0800)]
[automerger skipped] [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba am: 576e4ac184 am: d596c0e4ef -s ours
am: 34a17e0e25 -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1 dd8b0a6bc8 is in history

Change-Id: I7b4326dff6adb744cabbbc0f57e72b23102bb576

5 years ago[automerger skipped] [automerger] Select only preinstalled Spell Checker Services...
Guliz Tuncay [Fri, 11 Jan 2019 00:44:22 +0000 (16:44 -0800)]
[automerger skipped] [automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c am: 3c2abaa4da
am: 04206067b9 -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1 dd8b0a6bc8 is in history

Change-Id: I8be93eede6f7dcffc94905b5a790b1a813f28699

5 years ago[automerger skipped] [automerger] Revert "Select only preinstalled Spell Checker...
Bryan Ferris [Fri, 11 Jan 2019 00:36:37 +0000 (16:36 -0800)]
[automerger skipped] [automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba am: 576e4ac184
am: d596c0e4ef -s ours
am skip reason: change_id Idab3ecc246fe9344a09e6907a0ba39f8ea6506f9 with SHA1 dd8b0a6bc8 is in history

Change-Id: Ie171e4463c7d5ba062f5c978c47ff5560037acb6

5 years ago[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f...
Guliz Tuncay [Fri, 11 Jan 2019 00:21:07 +0000 (16:21 -0800)]
[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c
am: 3c2abaa4da

Change-Id: I2b4a8618280a602b4eb42db9bf822a14324b587f

5 years ago[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1...
Bryan Ferris [Fri, 11 Jan 2019 00:14:19 +0000 (16:14 -0800)]
[automerger] Revert "Select only preinstalled Spell Checker Services" am: 170e24d4e1 am: fb3b187f10 am: 7abf49d3b7 am: 1684713f2e am: cd6eba50ba
am: 576e4ac184

Change-Id: I304213f41d8b6f499d022f453392234ae901b36c

5 years ago[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f...
Android Build Merger (Role) [Thu, 10 Jan 2019 17:55:03 +0000 (17:55 +0000)]
[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147 am: d962aabf4c

Change-Id: I4fa4b56b1472ed6c25bc431ef9ce8060cb04a1f1

5 years ago[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f...
Android Build Merger (Role) [Thu, 10 Jan 2019 17:54:53 +0000 (17:54 +0000)]
[automerger] Select only preinstalled Spell Checker Services am: ed5973b8a8 am: 5ab7f995ba am: d71a5db522 am: 276e18c147

Change-Id: I2a8463e8e885a81229b28e7e99e7432a08a04c93