Commit Graph

9404 Commits

Author SHA1 Message Date
Adam Powell
4dadd95b54 Don't hold old host callback for fragments on the back stack am: 180202f221 am: 5254ef7bd3
am: d10cf26137

Change-Id: Ia02f0612f1665c412e0eedf1a2172d9919e0bd28
2016-09-22 06:48:37 +00:00
TreeHugger Robot
9e4a6401d0 Merge "Use separate switch ops for runtime permissions" 2016-09-22 05:04:41 +00:00
Adam Powell
d10cf26137 Don't hold old host callback for fragments on the back stack am: 180202f221
am: 5254ef7bd3

Change-Id: I067c4fc441b34a7f9edfdbfee0995e91054fb890
2016-09-22 05:00:40 +00:00
Chris Tate
fe4252db76 Merge "Fix WallpaperManager APIs" am: 73e89cd290 am: 6e1400f43f am: 2cc80a362a
am: a03b5be55c

Change-Id: I275ff3e8b133084af043e36d20f3cbd2b91f161f
2016-09-22 04:56:11 +00:00
Adam Powell
5254ef7bd3 Don't hold old host callback for fragments on the back stack
am: 180202f221

Change-Id: I7f2c4c8d340b1b54d3e9ded5819e19fa3e4bc83e
2016-09-22 03:52:35 +00:00
Svet Ganov
99e4d51584 Use separate switch ops for runtime permissions
If permissions review is enabled we allow individual
control of fine graned permissions in the SMS group.
This change ensures these permissions use the
corresponding app op as a switch to allow indifidual
control.

Change-Id: I83cd78a78a8266df8324b8a10cd9e36c04ff3112
2016-09-21 19:56:27 -07:00
Adam Powell
180202f221 Don't hold old host callback for fragments on the back stack
LoaderManagers configure their host callback lazily as their
associated fragment is brought up through its lifecycle states. In the
case of fragments on the fragment back stack this could happen very
late, if at all. As a LoaderManager's host callback references the
host Activity, this means that a LoaderManager could keep a destroyed
Activity reference alive.

Update the host callbacks of all LoaderManagers eagerly during the
restore non-configuration instance phase.

Bug: 30653222
Test: core/tests/coretests/src/android/app/LoaderLifecycleTest.java
Change-Id: I5d2b81daae5e7cae429fcf4934e64b3ce281140c
2016-09-21 15:47:06 -07:00
Edward Savage-Jones
6009d9db88 Fix WallpaperManager APIs
When support for lockscreen wallpapers was added in API level 24 the
behaviour for earlier API versions changed. Calls to the old 'set' APIs
no longer affect the overall device wallpaper, and can result in an end
user not being able to change their lockscreen wallpaper.

This upload restores the original API behaviour.

Bug: 31204228
Bug: 30456015
Change-Id: Ia16d2e2e379c54d798eef8f5c653099c2c581d78
2016-09-21 15:13:39 -07:00
Chris Tate
a03b5be55c Merge "Fix WallpaperManager APIs" am: 73e89cd290 am: 6e1400f43f
am: 2cc80a362a

Change-Id: I57bc74595d92a6c1bfe0d2c9cc75e442723c4f4c
2016-09-21 20:47:24 +00:00
Chris Tate
2cc80a362a Merge "Fix WallpaperManager APIs" am: 73e89cd290
am: 6e1400f43f

Change-Id: I1b220d887daefe160472fb41959a03eb20e1b98e
2016-09-21 20:39:56 +00:00
Svetoslav Ganov
8b6456bc88 Merge "Move device serial behing a permission" 2016-09-21 03:32:47 +00:00
Dianne Hackborn
3da7e4e563 A little more on issue #30766518: Document what targeting N does
am: da6be5b871

Change-Id: Ie1fdb2b07ff8fa016a82a1405336db0dac119fef
2016-09-20 17:07:15 +00:00
Dianne Hackborn
bae14052a0 Cherrypick so we can publish N version code description ASAP
am: 491bc2b8d6

Change-Id: I27da25afcaca61ac0159699c0cfc8fbf2338aa2c
2016-09-20 17:05:09 +00:00
Julia Reynolds
3076624ab1 Null check action cloning. am: 53c934cb75 am: f459b5ee8a
am: 775feb1cf7

Change-Id: Ib47c6ed1f1201781771232f5f576a59788e8595f
2016-09-20 06:02:01 +00:00
Julia Reynolds
775feb1cf7 Null check action cloning. am: 53c934cb75
am: f459b5ee8a

Change-Id: If1b0516f2d9fa796fa02d2a00451657dbba1ea70
2016-09-20 00:10:17 +00:00
Julia Reynolds
f459b5ee8a Null check action cloning.
am: 53c934cb75

Change-Id: I8cfdd960327c517df28eb7b00a8edac330f6b32f
2016-09-19 22:15:29 +00:00
Julia Reynolds
d0f20c2bbd Merge "Null check action cloning." into nyc-mr1-dev 2016-09-19 20:35:34 +00:00
Dianne Hackborn
da6be5b871 A little more on issue #30766518: Document what targeting N does
(cherry picked from commit 5f1649e852)

Change-Id: Ieaad1f3ddfa7ef3444e3b513181555f87ecb8c3f
2016-09-19 20:05:07 +00:00
Dianne Hackborn
491bc2b8d6 Cherrypick so we can publish N version code description ASAP
Fix issue #30766518: Document what targeting N does

Also small documentation cleanup in a few other places.

(cherry picked from commit b34cbedb4e)

Change-Id: I9560b29faa4f2674277349272af8193122a1f95e
2016-09-19 19:31:19 +00:00
Android Build Merger (Role)
7c2e30c48f Merge "Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 am: bd5d0049d7 am: f7caea844f" 2016-09-17 00:46:38 +00:00
Jeff Sharkey
b72e835129 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296 am: bd5d0049d7
am: f7caea844f

Change-Id: Ifa9167a9a69240712a59b90839a32605cfdd7037
2016-09-17 00:46:04 +00:00
Jeff Sharkey
f7caea844f Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296
am: bd5d0049d7

Change-Id: Ia9f491892b3b26938dd11f3ed8fc63cc81d37490
2016-09-17 00:35:38 +00:00
Jeff Sharkey
ec0933c4bf Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927 am: db901ee296
am: 6495c5ef30

Change-Id: I0e5463ab40cbea425badf360388d316a50299dd0
2016-09-17 00:34:52 +00:00
Jeff Sharkey
bd5d0049d7 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927
am: db901ee296

Change-Id: I9033fb021c68bbfc4a8d706e1e7c059f294f510c
2016-09-17 00:24:10 +00:00
Jeff Sharkey
6495c5ef30 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff am: 33ada2e927
am: db901ee296

Change-Id: I683e1c33b8058a597163aacfc744df339188cd37
2016-09-17 00:23:53 +00:00
Jeff Sharkey
db901ee296 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3 am: fc1c0f9dff
am: 33ada2e927

Change-Id: I9b6d2b6f9101e7e7610f191cd4927d568ae0476a
2016-09-17 00:13:26 +00:00
Jeff Sharkey
33ada2e927 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3
am: fc1c0f9dff

Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a
2016-09-16 23:40:13 +00:00
Jeff Sharkey
fc1c0f9dff Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8
am: afcd1135c3

Change-Id: I9cbfddb282796b2425a0da76760bde0ebd8336b4
2016-09-16 23:31:45 +00:00
Jeff Sharkey
afcd1135c3 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
am: df42d732f8

Change-Id: Ib7efd9dacf476d8a717456d8e6fc7ee617483d17
2016-09-16 23:14:51 +00:00
Jeff Sharkey
df42d732f8 Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537
Change-Id: Ib1a0bbb34edb61666ac5739f0b0eaadbe4c5fe06
2016-09-16 16:57:55 -06:00
Andrii Kulian
8072d11f6a Configuration renaming and minor cleanup in AM and WM
- Configuration members in AM and WM are renamed to
  mGlobalConfiguration.
- Renamed parameters names in some methods to better represent
  their meaning.
- Added and fixed some docs.

Change-Id: Ie51f687fe4c10dbce776435f29d6b853fda50eec
2016-09-16 15:40:30 -07:00
Jeff Sharkey
0a9d537f62 Use "all_downloads" instead of "my_downloads". am: 1547194418 am: f6d7c1ed15
am: 6db572cf00

Change-Id: I687a883d528cc260aad3ee3da5600d3e0542c940
2016-09-16 22:07:27 +00:00
Jeff Sharkey
f6d7c1ed15 Use "all_downloads" instead of "my_downloads".
am: 1547194418

Change-Id: I6dabba1f82ef1989eb2a52c3c493127a174ff315
2016-09-16 21:48:24 +00:00
Julia Reynolds
53c934cb75 Null check action cloning.
Bug: 31275706
Change-Id: I7f8c14a5863d2f787b9090ef740e80ce0c4b9335
2016-09-16 18:07:36 +00:00
Jeff Sharkey
1547194418 Use "all_downloads" instead of "my_downloads".
We can no longer return the "my_downloads" paths: if those Uris were
shared beyond the app that requested the download, access would be
denied.  Instead, we need to switch to using "all_downloads" Uris so
that permission grants can be issued to third-party viewer apps.

Since an app requesting a download doesn't normally have permission
to "all_downloads" paths, DownloadProvider now issues narrow grants
toward the owner of each download, both at device boot and when new
downloads are started.

Bug: 30537115, 30945409
Change-Id: I533125b36444877f54373d88922f2acc777e250b
2016-09-16 12:04:05 -06:00
Julia Reynolds
90eba6d81c Merge "Add Notification channels" 2016-09-16 15:35:27 +00:00
Julia Reynolds
38e6ca4e74 Allow Condition Providers to bind/unbind themselves
So they only run when needed.

Change-Id: I5cf3a572837cb773dcb4f278a9f86a9d909147e4
Fixes: 30727598
2016-09-15 19:31:29 +00:00
Julia Reynolds
04499531c2 Make docs match reality.
Change-Id: I51cc6a1e18e9e17284a7afbf0c13257d0de22d5b
Fixes: 30769600
Fixes: 30908728
2016-09-15 16:52:17 +00:00
Nicolas Prévot
0d9518b6f9 Merge "Fix constant errors in ActivityManagerNative." 2016-09-15 12:55:43 +00:00
Julia Reynolds
b5e44b7966 Add Notification channels
In this iteration:
-Every app gets a default channel that notifications will be posted
to if they don't specify a channel themselves. The default channel
inherits app-wide settings on upgrade.
-Apps can create new channels without user approval, but apps
cannot change the name of a channel once created, nor can they ever
set the importance.
- When a notification is posted:
  - If the channel is marked as 'vibrates', vibration will be
    applied to notifications that lack a vibration. unlike the default
    notification flag, notifications will retain their custom vibration
    if given
  - Same with sound and lights
  - A notification's importance is the min of the app and channel
    importance
  - A notification can bypass dnd if: either the app or channel settings
    say it can
  - A notification's show on lockscreen setting comes from the app first,
    and the channel second if the app has no preference

Tests: in cl. also there's a cl for cts and a test app.

Change-Id: I630f99df655800b00586dcfab538d320d04fe0f0
2016-09-15 08:42:35 -04:00
Rubin Xu
3ba5331a83 resolve merge conflicts of 4daa1b7 to master
Change-Id: I5292c074234fccc26c7a843f56eb68edce26d678
2016-09-15 10:42:50 +01:00
Michal Karpinski
4a134a93d2 Merge "Fingerprint Strong auth timeout" 2016-09-15 07:46:07 +00:00
TreeHugger Robot
944b003747 Merge "Support for specifying orientation in WindowContainer" 2016-09-14 21:21:21 +00:00
Wale Ogunwale
45dcd8fb9e Immediately deliver new intent to paused activity in docked stack am: 826c706156 am: 35871b76b3
am: f872ce62c4

Change-Id: I266b97e858e7b4aa9c56fd3b55401970b4575698
2016-09-14 19:59:55 +00:00
Rubin Xu
4daa1b7df4 Allow direct-boot aware activity to show before profile is unlocked am: 89927b3cd9
am: df5e18245f

Change-Id: I38cb058bf7cf58c0553a2addfc68517244c87df7
2016-09-14 17:53:40 +00:00
Nicolas Prevot
011aaa1a15 Fix constant errors in ActivityManagerNative.
Change-Id: Ie68ea6fcfb95dfa44d29418f3fbc0f6dd7b241a8
2016-09-14 17:27:15 +01:00
Wale Ogunwale
5136249a71 Support for specifying orientation in WindowContainer
Also,
- Fixed failing tests when they are ran as a package vs.
individual classes due to multiple window manager instance.
- Correct some isVisible logic to so a window container that
is invisible is not said to be visible, because one of its
children is visible.

Bug: 30060889
Change-Id: I1bb8730361be2a9f5ce88cd59b7d57d5a459bde6
2016-09-14 08:43:12 -07:00
Rubin Xu
89927b3cd9 Allow direct-boot aware activity to show before profile is unlocked
Work profile challenge is shown by intercepting normal activity launching and
replacing it with the confirm credential activity. For direct boot aware
activities, they should be able to be displayed when the work profile is
still locked, so add a conditional in the activity intercepting logic to bypass
work challenge in this case.

Also launching work profile activities from notification is handled specially
in order to avoid dismissing the notification if the work challenge is canceled,
so add similar logic there to allow direct boot aware activity to go through.

Bug: 30296144
Change-Id: Ib6395271cee2d4781009bb08d50351d73824de0c
2016-09-14 11:59:56 +01:00
Wale Ogunwale
f872ce62c4 Immediately deliver new intent to paused activity in docked stack am: 826c706156
am: 35871b76b3

Change-Id: I987f75b6c8055da5f43880419c4be72d1479ee93
2016-09-13 20:30:34 +00:00
Wale Ogunwale
826c706156 Immediately deliver new intent to paused activity in docked stack
When the docked stack is minimized and we are unminimizing it
due to a request to start it's currently paused top activity,
it is possible for the new intent not do be delivered immediately
because it isn't resumed due to another activity been launched in
the system (Recents) which is resumed instead. So, the user won't
see the effect of the new intent until they touch the docked activity
causing it to get the new intent and resume.
We now deliver new intents to the top activity in the docked stack if
it is in a minimized state. Then on the client side we temporarily
resume the activity and pause it again to guarantee onResume is called
after onNewIntent.

Bug: 31371093
Change-Id: Ib1764ccf5efc9d6498ce6cc8a34236c79fc07dad
2016-09-13 10:38:30 -07:00