Commit Graph

452154 Commits

Author SHA1 Message Date
Howard Ro
4697c7f5e1 Merge "StatsEvent unit tests" 2019-11-25 03:12:27 +00:00
Jason Chiu
039a30fbd7 Merge "[SettingsLib] Support master switch of inline toggle of Settings Injection v2" 2019-11-25 02:36:08 +00:00
TreeHugger Robot
bc56ea3551 Merge "Add change ID for platform compat" 2019-11-25 00:23:58 +00:00
David Castro
5df37b4e9b Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev am: e3681d08e9 am: 0c8d339950 am: b69d94a847
am: d52dd84fbf

Change-Id: Ia9ce650cb5d061d636ed0b6f21ed101fd0a5c9f5
2019-11-24 04:58:51 -08:00
Hai Shalom
f022baab71 [automerger skipped] Merge "Revert submission" into qt-qpr1-dev am: 65c9665125
am: f8a5719cfc -s ours
am skip reason: change_id Iff36d5a10e6c8ee8978a5842af8f19efc10c0a91 with SHA1 5579604a1d is in history

Change-Id: Iceeedbce2cc16fb2c46b944d80a3c5363ea40de7
2019-11-24 04:56:39 -08:00
Roshan Pius
61069abccb Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module" 2019-11-24 06:57:07 +00:00
Jing Ji
bf7a155295 Wait for the dying app fully killed on getting content provider
If we are acquiring a content provider, but the hosting process
is dying, wait for its death notification come in, before
restart this process.

Bug: 141857656
Test: manual
Change-Id: Ib2a8014bb3f22485172d0574cfce14bc6895034b
2019-11-24 04:52:13 +00:00
Wale Ogunwale
847e67617e Merge "Fix problem with clearing root activity during task reset" 2019-11-23 15:22:38 +00:00
Wale Ogunwale
89ce6b322a Fix problem with clearing root activity during task reset
Problem introduced during code refactor.

Fixes: 145015624
Test: Camera launchs from home activity.
Change-Id: I9ed474471ccbcc333892301b06e79a58cef5a207
2019-11-22 22:17:09 -08:00
Shuo Qian
4aeff5ba6e Merge "Introduce APIs for Emergency Number Database version" 2019-11-23 02:33:50 +00:00
TreeHugger Robot
da0af1203b Merge "Remove UserUsageStatsService#userUnlocked." 2019-11-23 01:55:39 +00:00
TreeHugger Robot
276b49f758 Merge "Create empty PowerWhitelistManager." 2019-11-23 01:33:12 +00:00
TreeHugger Robot
cd79af4eec Merge "Initial IME inline suggestions APIs" 2019-11-23 01:21:02 +00:00
TreeHugger Robot
da0dbcdb12 Merge "Remove call to setLayerStack for BlackFrame Surface" 2019-11-23 00:27:52 +00:00
Varun Shah
8958d5d0bc Remove UserUsageStatsService#userUnlocked.
UsageStatsDatabase#init was being called twice every time - once when
the usage stats service was initialized and once when the user was
unlocked. However, this was unnecessary and doing duplicate work since
on user unlock, when the service is initialized, the database is also
initialized.

Bug: n/a
Test: atest UsageStatsTest
Change-Id: Ic74ba3ff8a0b68c97340ffe25b19065e1a046731
2019-11-22 16:14:24 -08:00
TreeHugger Robot
9711bbdd15 Merge "Change visibility of members in StatsEvent" 2019-11-23 00:08:52 +00:00
Sarah Chin
b63c1d95e4 Merge "Add NR to CellInfo" 2019-11-22 23:48:47 +00:00
Evan Rosky
1d650e941c Merge "Add per-display Configuration change reporting" 2019-11-22 23:43:49 +00:00
Jing Ji
54fdfa62b9 Merge "Fix flaky test ActivityManagerProcessStateTest#testCycleFgsTriangleBiDi" 2019-11-22 23:36:14 +00:00
TreeHugger Robot
45b2e87b26 Merge "Fix wembley system UI" 2019-11-22 23:23:31 +00:00
TreeHugger Robot
8cca880bee Merge "Revert change to non-profile user badged icon" 2019-11-22 22:48:09 +00:00
TreeHugger Robot
153f66fb91 Merge "Fix "Allow the system AssetManager to be reinitialized for testing"" 2019-11-22 22:39:00 +00:00
TreeHugger Robot
2768219198 Merge "Revert "Make getStateDescription() in View none final"" 2019-11-22 22:37:00 +00:00
Marissa Wall
9b98e89d02 Merge changes from topic "b143889121"
* changes:
  Revert "Add a job to prune UsageStats data on package removals."
  Revert "Prune obsolete UsageStats data on upgrade."
2019-11-22 22:10:38 +00:00
TreeHugger Robot
72672006c8 Merge "Make Settings.Global.HIDE_ERROR_DIALOGS a TestApi" 2019-11-22 22:09:36 +00:00
Ahmed ElArabawy
c9f242dad3 Wifi: Make setScanningEnabled() a system API
This commit makes the the API WifiScanner.setScanningEnabled() a System
API to allow priviliged apps to use it.

Bug: 140541571
Test: atest com.android.wifi.server
Change-Id: Id7377415699f2d8a8aea396889716dca1e23ecd5
2019-11-22 21:56:48 +00:00
Blake Kragten
037af74e05 Merge "GPS Atoms Addition" 2019-11-22 21:44:56 +00:00
Greg Kaiser
8d8c3b7aad Fix wembley system UI
Test: Verified wembley UI works
Bug: 144958550
Change-Id: I08f77a6507edc076758d53f051fadd60fa6c8f9d
2019-11-22 13:39:44 -08:00
TreeHugger Robot
d5cc921535 Merge "Avoids deadlock when applying preferred activities" 2019-11-22 21:11:42 +00:00
Marissa Wall
1a1c61b23e Revert "Add a job to prune UsageStats data on package removals."
This reverts commit ece1fa0ba1.

Reason for revert: b/144982898

Change-Id: I95834b3e6b28d569a28088357ab6bfb4d3a0c7ff
2019-11-22 12:49:35 -08:00
Marissa Wall
7172000c75 Revert "Prune obsolete UsageStats data on upgrade."
This reverts commit 5228cc20bb.

Reason for revert: b/144982898

Change-Id: Ia28e2daff5a5904f4a75d6fb0ea1e3c855d68616
2019-11-22 12:49:09 -08:00
TreeHugger Robot
4658f49c6a Merge "Make sure known packages are preinstalled" 2019-11-22 20:36:56 +00:00
Bill Yi
8443c5e906 Merge "Import translations. DO NOT MERGE" 2019-11-22 20:35:25 +00:00
Bill Yi
f38887c6e8 Merge "Import translations. DO NOT MERGE" 2019-11-22 20:34:30 +00:00
TreeHugger Robot
baa22d597c Merge "Convert TestActivityDisplay.create to Builder" 2019-11-22 20:26:56 +00:00
TreeHugger Robot
d9f8512fe8 Merge "Remove Dep.get(MAIN_HANDLER) from TileQueryHelper" 2019-11-22 20:14:30 +00:00
Fabian Kozynski
118612037b Merge "Use NfcAdapter#getDefaultAdapter in NfcTile" 2019-11-22 20:14:18 +00:00
TreeHugger Robot
12b46ae6e7 Merge "Add TEST_MAPPING for com/android/internal/app." 2019-11-22 20:06:59 +00:00
Patrick Baumann
182ea1cd99 Avoids deadlock when applying preferred activities
Prior to this change, we were resolving the mime type of a given intent
while holding the package lock. With this change, we instead rely on the
preferred-activity declaration to define the mime type if it's
important, removing need for an activity manager service call and the
potential for deadlock.

Bug: 143105100
Test: Manual; sideload to /system/etc/preferred-apps/ and reset app preferences
Change-Id: Ie0b124216b49a1147bd5c2e82cf8c7cadb3f08ac
2019-11-22 11:55:10 -08:00
Kweku Adams
e371b09fbf Create empty PowerWhitelistManager.
This is the first step in extracting the power whitelist from
DeviceIdleController. The whitelist will stay inside the JobScheduler
mainline module boundary, so all calls will have to be made through a
stable API. Eventually, all users of IDeviceIdleController will be
migrated to this interface.

Bug: 140141678
Bug: 141155196
Bug: 144864180
Test: atest PowerWhitelistTest
Change-Id: I8468e74ac8fe6611bfa957d4f5093c8d15be1299
2019-11-22 11:54:24 -08:00
TreeHugger Robot
c8609b5872 Merge "Fixed arg count with Quad/Quint pooled predicates" 2019-11-22 19:37:50 +00:00
Bookatz
d6296d7348 Revert change to non-profile user badged icon
ag/9507174 moved the profile badging logic, but accidently also touched
the non-profile badging logic. This cl just reverts that line back to
how it was originally.

Note that, in DevicePolicyManager terminology, the managed user is
called a 'profile', but in UserManager terminology, it is not. In this
commit message, I am using the word 'profile' in the UserManager sense.

Test: Manually confirmed with TestDPC that a managed non-profile user
has a badge
Fixes: 144831236

Change-Id: Icd4f215d49f317a0df8065d3c48c68eee0fd5b2c
2019-11-22 11:37:41 -08:00
Evan Rosky
822070856d Add per-display Configuration change reporting
Adds reporting per-display configuration changes to
hierarchy listeners. On system-ui's side, the
DisplayWindowController then dispatches to other registrants
within the process.

Bug: 133381284
Test: Added testDisplayWindowListener
Change-Id: I68c4e9e229b97a9e91ad0d4f5276447a947c413b
2019-11-22 11:36:11 -08:00
TreeHugger Robot
f4eb2ca0d7 Merge "Fix for Surface#lockHardwareCanvas lockups" 2019-11-22 19:12:36 +00:00
TreeHugger Robot
3f0a602a3a Merge "Reacquire wm lock when positing to handler" 2019-11-22 19:04:25 +00:00
Sunny Goyal
8470c533ba Merge "Dumping the view hierarchy to the output stream instead of a separate file" 2019-11-22 18:49:36 +00:00
Deepika Likhite
27b2fa177d Revert "Make getStateDescription() in View none final"
This reverts commit c9cb2e8307.

Reason for revert: <http://b/144786884>

Bug: 144786884

Exempt-From-Owner-Approval:see go/perf-revert-first

Change-Id: I0dd6047c2d3c8d757d8e1afe66d85a60075536b6
2019-11-22 18:31:01 +00:00
TreeHugger Robot
daa5ac49ac Merge "Make taps on the row toggle switches" 2019-11-22 18:26:37 +00:00
chaviw
deb69378a5 Remove call to setLayerStack for BlackFrame Surface
There's no need for the black frame to call setLayerStack since it's a
child of the overlay layer. Calling setLayerStack does nothing, but it
will produce an error message in SurfaceFlinger since the caller is
trying to set a specified layerStack on a layer that's not the root.
Deleting thihs code to remove the error spam in logcat.

Also removed it from the Watermark code since it's also a child of the
overlay layer.

Bug: 144824244
Test: No more error log about invalid layerStack in SF
Change-Id: I2f64d50d81af9caf8debe289c4a8eda7c2a61031
2019-11-22 10:25:09 -08:00
Feng Cao
04830a3faf Initial IME inline suggestions APIs
Test: manual verification with other local changes
Bug: 137800469

Change-Id: Ia0ead9d7208512920a3277559cef0bb92bea35f5
2019-11-22 10:23:37 -08:00