Commit Graph

13862 Commits

Author SHA1 Message Date
Amith Yamasani
be421890b6 Merge "Fix for missing location icon" into pi-dev am: 8c4c359b25
am: 2b04227379

Change-Id: Ib61d6ed9db7082f5255c7b9eba61cc4616e7019e
2018-05-29 13:33:44 -07:00
Amith Yamasani
2b04227379 Merge "Fix for missing location icon" into pi-dev
am: 8c4c359b25

Change-Id: I1e108f56230915e0950712a0fa2cc363e3ffbc9e
2018-05-29 13:22:35 -07:00
TreeHugger Robot
cefa90e4da Merge "Revert "Update BM.requestRestore() docs format"" 2018-05-29 13:52:30 +00:00
Bernardo Rufino
641043fe9b Revert "Update BM.requestRestore() docs format"
This reverts commit 5d049e5471.

Reason for revert: Prevent conflicts w/ auto-merging ag/4205743 

Change-Id: Idba725e67cb9bf87640f97d627d5571b3ad8b95e
2018-05-29 11:58:00 +00:00
Amith Yamasani
a1ce963743 Fix for missing location icon
OpEntry.duration was being used to indicate that the
operation was still running if -1 is returned. A recent
change caused a regression.

Adding a new mRunning field in OpEntry to explicitly
hold the running state, even when partial duration is
updated.

Change-Id: Ib29f4c903f990aaa202e84f964959aedfc24abdb
Fixes: 80242152
Test: atest FrameworksServicesTests:AppOpsActiveWatcherTest
Test: Launch maps and verify the location icon is visible
      in the status bar
2018-05-28 21:20:56 -07:00
Jason Monk
3a3c2157da Merge "Final cleanups to permission slices" into pi-dev am: 64a33d695d
am: 3f3f1ebc17

Change-Id: I075703514267496004435b984733133c3a8887bf
2018-05-25 15:34:58 -07:00
Jason Monk
3f3f1ebc17 Merge "Final cleanups to permission slices" into pi-dev
am: 64a33d695d

Change-Id: I3256c8ca665ede11bab55072cddb8598c1d3b51b
2018-05-25 15:26:03 -07:00
TreeHugger Robot
64a33d695d Merge "Final cleanups to permission slices" into pi-dev 2018-05-25 22:10:20 +00:00
Selim Cinek
e59e48e9c1 Merge "Fixed the behavior of group conversations when targeting P" into pi-dev am: c4e19963f4
am: 7712d46760

Change-Id: Ib07dc6354fb3a5fa5ff6171d1c656634465b29fa
2018-05-25 13:30:42 -07:00
Selim Cinek
7712d46760 Merge "Fixed the behavior of group conversations when targeting P" into pi-dev
am: c4e19963f4

Change-Id: I7e5feadc253816852528e06719e136a7cba51c49
2018-05-25 13:21:38 -07:00
Selim Cinek
c4e19963f4 Merge "Fixed the behavior of group conversations when targeting P" into pi-dev 2018-05-25 20:06:52 +00:00
Jason Monk
b14dde0793 Final cleanups to permission slices
- Add icons to the right and shortcut modes
 - Add color
 - Make sure dialogs are secure

Test: manual
Bug: 79960669
Change-Id: I6d251b0ea5bd3c1b3eed32b184e4aae22c52ffb5
2018-05-25 15:42:16 -04:00
Selim Cinek
ce8794fbbc Fixed the behavior of group conversations when targeting P
Fixes an issue where the group conversation heuristic was still
applied even when the app is targeting P. We're now following
the isGroupConversation completely and only do the migration
for apps targeting < P.

Change-Id: I471d58e8a8f5e6270f0dcce8691d08a2bdd1c582
Fixes: 78450835
Test: add messaging notification, observe correct display
2018-05-25 09:16:38 -07:00
Makoto Onuki
da4db58021 Merge "Tweak exemption for sync requests made by FG apps" into pi-dev am: 621fd20f55
am: d8cf91c5f8

Change-Id: Icac177c8d404ce20d5e894d85df2b72a001d6d9a
2018-05-24 22:14:27 -07:00
Michael Wachenschwanz
38c22431be Merge "Revert "Revert "Write UsageEvents Parcel data as a Blob""" into pi-dev am: 14c61286c4
am: 3ba689851c

Change-Id: Id5fa43e2706fc76436d9d2b7cea3d18e73181248
2018-05-24 18:28:37 -07:00
Lucas Dupin
1033fb3405 Merge "Revert "WallpaperColors hint computation"" into pi-dev am: cf2c35dca6
am: 30f0867ee0

Change-Id: Iae41244b5541945304d8965c22602efbd4b32988
2018-05-24 18:00:11 -07:00
Makoto Onuki
d8cf91c5f8 Merge "Tweak exemption for sync requests made by FG apps" into pi-dev
am: 621fd20f55

Change-Id: I31ae3e9e11b9defb7e6352830439484d7ec7ac01
2018-05-24 17:54:37 -07:00
Michael Wachenschwanz
6e781d9914 Merge "Revert "Write UsageEvents Parcel data as a Blob"" into pi-dev am: d55c618340
am: 2c2424a091

Change-Id: I707afa9244687be4356b5f7109b320433737239a
2018-05-24 17:35:33 -07:00
Makoto Onuki
621fd20f55 Merge "Tweak exemption for sync requests made by FG apps" into pi-dev 2018-05-24 23:22:09 +00:00
Michael Wachenschwanz
3ba689851c Merge "Revert "Revert "Write UsageEvents Parcel data as a Blob""" into pi-dev
am: 14c61286c4

Change-Id: If4e6d7fbf0d6799ce88ec33b37fb8cef7e290f1e
2018-05-24 14:26:40 -07:00
Lucas Dupin
30f0867ee0 Merge "Revert "WallpaperColors hint computation"" into pi-dev
am: cf2c35dca6

Change-Id: Ibc3760ce650c8d48f261e6486edb51582391b710
2018-05-24 14:03:24 -07:00
Michael Wachenschwanz
14c61286c4 Merge "Revert "Revert "Write UsageEvents Parcel data as a Blob""" into pi-dev 2018-05-24 20:45:34 +00:00
TreeHugger Robot
cf2c35dca6 Merge "Revert "WallpaperColors hint computation"" into pi-dev 2018-05-24 20:00:27 +00:00
Michael Wachenschwanz
2c2424a091 Merge "Revert "Write UsageEvents Parcel data as a Blob"" into pi-dev
am: d55c618340

Change-Id: I88a269fd3bcb9f6cda5c6f95ac7edb84db1239f1
2018-05-24 12:53:33 -07:00
Michael Wachenschwanz
76d03fcd7e Revert "Revert "Write UsageEvents Parcel data as a Blob""
This reverts commit 8520e56998.

Reason for revert: Bug Fixed
Bug:79860717
Bug:80215357

Change-Id: Ibaabe3c6bab72f417b24121a91ec5f953ad18ff7
2018-05-24 17:36:47 +00:00
Lucas Dupin
b5e5053ebc Revert "WallpaperColors hint computation"
This reverts commit c50f47d970.

Fixes: 79465234
Reason for revert: Google still does it using private APIs and apps were relying on this behavior, not good for the ecosystem.

Change-Id: I62e2b4cd1e6e562fcdd89c97e599bcdade83381a
2018-05-24 16:33:14 +00:00
Michael Wachenschwanz
d55c618340 Merge "Revert "Write UsageEvents Parcel data as a Blob"" into pi-dev 2018-05-24 15:54:05 +00:00
Michael Wachenschwanz
8520e56998 Revert "Write UsageEvents Parcel data as a Blob"
This reverts commit f5bae21c5e.

Reason for revert:
Bug: 79860717
Fixes: 80215357

Change-Id: I0768e5ce0a95afe7ff091c0035335437bb33c46c
2018-05-24 15:45:17 +00:00
TreeHugger Robot
a41a7094ac Merge "Add getCurrentTransportComponent() API" 2018-05-24 13:13:18 +00:00
Michael Wachenschwanz
227a7f57f6 Merge "Write UsageEvents Parcel data as a Blob" into pi-dev am: 615f8039af
am: 75957f43bc

Change-Id: I7670bcb9764897cfb833c20d0e0bd7be5444e98a
2018-05-23 19:23:45 -07:00
Chalard Jean
7e4adf8447 Merge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev am: ccf93b2792
am: 04a4425729

Change-Id: I03a6c8ec52a5aa4fd7620d18f7cf75fa115be73b
2018-05-23 18:19:53 -07:00
Julia Reynolds
313c1f04cf Merge "DO NOT MERGE Allow cross user usage event queries" into pi-dev
am: 452936192f

Change-Id: Ied4b55365157a03f9bcc15166b330ceb2e62530c
2018-05-23 17:51:11 -07:00
Michael Wachenschwanz
75957f43bc Merge "Write UsageEvents Parcel data as a Blob" into pi-dev
am: 615f8039af

Change-Id: I7e7f663d3eae14630cc5f2b357ead02c4875d19a
2018-05-23 17:38:41 -07:00
Chalard Jean
04a4425729 Merge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev
am: ccf93b2792

Change-Id: Ib8815f010883cdb94fcad2cdfb237de39327b20a
2018-05-23 16:44:47 -07:00
Makoto Onuki
d5f25d2cd8 Tweak exemption for sync requests made by FG apps
Exemption given to a sync request made by a foreground app (including
PROCESS_STATE_IMPORTANT_FOREGROUND).
At the schedule time, we promote the sync adapter app for a higher bucket:
- If the device is not dozing (so the sync will start right away)
  promote to ACTIVE for 1 hour.
- If the device is dozing (so the sync *won't* start right away),
promote to WORKING_SET for 4 hours, so it'll get a higher chance to be started once the
device comes out of doze.
- When the sync actually starts, we promote the sync adapter app to ACTIVE for 10 minutes,
so it can schedule and start more syncs without getting throttled, even when the first
operation was canceled and now we're retrying.

Test: atest cts/tests/tests/syncmanager/
Test: Manual test with "requestsync -f" and "am set-standby-bucket", while checking
"dumpsys usagestats"
Test: settings put global app_idle_constants \
  exempted_sync_scheduled_nd_duration=1,exempted_sync_scheduled_d_duration=2,exempted_sync_start_duration=3
  and check "dumpsys usagestats" and make sure the constants are properly updated.
Fixes: 72443754

Change-Id: I233d8e4be85769150830bac798abc04810f4cc7b
2018-05-23 14:50:05 -07:00
TreeHugger Robot
452936192f Merge "DO NOT MERGE Allow cross user usage event queries" into pi-dev 2018-05-23 21:49:56 +00:00
TreeHugger Robot
615f8039af Merge "Write UsageEvents Parcel data as a Blob" into pi-dev 2018-05-23 21:38:48 +00:00
Selim Cinek
8afa50f9b4 Merge "Hiding the icon of notifications that were replied to" into pi-dev am: d018bc4346
am: 1faf5d2fc1

Change-Id: I713d18570a7d582dd8dd7538bab2a303e56de3b3
2018-05-23 13:54:46 -07:00
Selim Cinek
573f2dff31 Merge "Allowing the notification to be a bit bigger for the remote input history" into pi-dev am: 9e3d7d6378
am: 3cae282644

Change-Id: I4d4cb0287e87f3c9e1382cc92f0adaa7495bef80
2018-05-23 13:50:10 -07:00
Selim Cinek
1faf5d2fc1 Merge "Hiding the icon of notifications that were replied to" into pi-dev
am: d018bc4346

Change-Id: Ieb2d44f76ee2b3624e1b30c5c0a381e7774e8591
2018-05-23 12:30:24 -07:00
Selim Cinek
3cae282644 Merge "Allowing the notification to be a bit bigger for the remote input history" into pi-dev
am: 9e3d7d6378

Change-Id: I0ded19e5d634ef3c81c68a58b92061b9dfda2c00
2018-05-23 12:25:58 -07:00
Chalard Jean
ccf93b2792 Merge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev 2018-05-23 17:59:59 +00:00
TreeHugger Robot
7f297c0f34 Merge "Update BM.requestRestore() docs format" 2018-05-23 15:50:21 +00:00
Julia Reynolds
20e682910d DO NOT MERGE Allow cross user usage event queries
For multipackage requests, caller must be system uid or hold
interact_across_users if not requesting fate for the same user.

For single package requests, caller must be system uid or the
same package and hold interact_across_users if not requesting data
for the current user.

In both cases the caller must have the usagestats permission.

Test: couldn't find automated tests for this file; manual
Bug: 79142791
Change-Id: I8d650f8e875e0e4578cb48c9ba42e821342852a0
2018-05-23 09:51:13 -04:00
Bernardo Rufino
5d049e5471 Update BM.requestRestore() docs format
Put <p> to separate deprecation block from rest of method (check
https://developer.android.com/reference/android/app/backup/BackupManager)
to see wrong format.

Bug: 29255593
Test: Builds
Change-Id: I1677aacfe51394f5a51ed39f78f52ed4843abf83
2018-05-23 13:05:12 +01:00
TreeHugger Robot
d018bc4346 Merge "Hiding the icon of notifications that were replied to" into pi-dev 2018-05-23 05:51:30 +00:00
TreeHugger Robot
9e3d7d6378 Merge "Allowing the notification to be a bit bigger for the remote input history" into pi-dev 2018-05-23 05:43:16 +00:00
Selim Cinek
b0dc61b503 Hiding the icon of notifications that were replied to
Because those notifications now stay around but the user
has already seen them, were hiding the icon instead.

Change-Id: I6b8590e31295ed79218698b1ac54df33b273d38c
Fixes: 78486801
Test: add notification, reply, observe icon gone
2018-05-22 19:48:37 -07:00
Selim Cinek
bee4e074bb Allowing the notification to be a bit bigger for the remote input history
This also fixed the squishing when heads-upped by only allowing
one remote input text to be visible when heads upped.

Change-Id: I0c77931233b452420dee4dcf4772092d96d214c9
Fixes: 78877946
Test: add inbox style with 6 entries, reply a few times, observe no squishing
2018-05-22 19:00:35 -07:00
David Chen
9da07521d7 Merge "Marks deprecated StatsManager APIs." into pi-dev am: 4245b12ef9
am: 09889edcfb

Change-Id: I571ec092ffb9f007be812294e9c7ec47f923c141
2018-05-22 10:55:58 -07:00