32109 Commits

Author SHA1 Message Date
Julia Reynolds
5d25ee7a00 Topics can now have an Importance.
Bug: 22451710
Change-Id: I627121da6c4b85492715a8e8a099656dca52b734
2015-12-04 15:20:34 -05:00
Chris Wren
cf7021e827 Merge "Notification Assistant API" 2015-12-03 19:23:33 +00:00
Jeff Sharkey
8fbf16f6c6 Merge "Fix race condition when collecting op callback." am: 98844a97d2 am: 678011854b
am: 28d8b8c988

* commit '28d8b8c9882e501f95ec3076a4f1fffc759ea999':
  Fix race condition when collecting op callback.
2015-12-03 19:16:45 +00:00
Jeff Sharkey
5cbbdf2ca6 Merge "Improved variable naming" am: 4ef9d41066 am: bc57510e9f
am: ec0e46fbc6

* commit 'ec0e46fbc612cb9575ae3e7901664cd34666f438':
  Improved variable naming
2015-12-03 19:15:12 +00:00
Chris Wren
9fa689f8b6 Notification Assistant API
This API allows a single assistant on the device to help the
user manage their notification stream by taking actions on
individual notifications:

  - modifying their priority up or down when they are posted
  - possibly changing if and how the notification interrupts the user
  - adding annotations under notifications

Bug: 22455414
Change-Id: Idf47972bb71c83f1dc1c9ec68a6fa92ac4fc522f
2015-12-03 13:45:10 -05:00
Wale Ogunwale
2998eef694 Set proper stack in WM when activity is moved to stack in AM
When an activity is moved to a stack using the
ActivityStack#moveActivityToStack API a new task is created to
hold the activity in the stack. However, when the new task is
created in the window manager side it uses the stack id of the
previous stack the activity was in. We now pass the stack to use
from activity manager to window manager.

Bug: 25987309
Bug: 25961636
Change-Id: Iecc71f6d9b3e70a8d88e134b42f7532ba5327bad
2015-12-03 10:20:16 -08:00
Jeff Sharkey
28d8b8c988 Merge "Fix race condition when collecting op callback." am: 98844a97d2
am: 678011854b

* commit '678011854b0969f5fe69d597911beabcadcb03e8':
  Fix race condition when collecting op callback.
2015-12-03 17:11:22 +00:00
Jeff Sharkey
ec0e46fbc6 Merge "Improved variable naming" am: 4ef9d41066
am: bc57510e9f

* commit 'bc57510e9f359929a55130d8a35c61a84dad4568':
  Improved variable naming
2015-12-03 17:09:59 +00:00
Jeff Sharkey
678011854b Merge "Fix race condition when collecting op callback."
am: 98844a97d2

* commit '98844a97d2bd07146854783374ee3a19aed8edd5':
  Fix race condition when collecting op callback.
2015-12-03 17:03:53 +00:00
Jeff Sharkey
bc57510e9f Merge "Improved variable naming"
am: 4ef9d41066

* commit '4ef9d41066d8b4124c2c59752512adf24102634d':
  Improved variable naming
2015-12-03 17:02:21 +00:00
Jeff Sharkey
98844a97d2 Merge "Fix race condition when collecting op callback." 2015-12-03 16:58:34 +00:00
Jeff Sharkey
4ef9d41066 Merge "Improved variable naming" 2015-12-03 16:58:03 +00:00
Clara Bayarri
10ad84a17d Create a separate Work Challenge check
This allows us to tell lock checks from FBE checks separately,
and will be useful when dealing with password unification.

Change-Id: Ifbea425f749fee4d6d51faddd8b64bf717a1a5f8
2015-12-03 16:18:53 +00:00
Clara Bayarri
29fcf1b1db Apply Admin password restrictions to work profile
When the Work Challenge is in place, re-route the
enforcing of Admin policies on the password to the
work profile. The Admin should not be allowed to
dictate policies on the device lock in this case.

This is part of the Separate Work Challenge feature.

Change-Id: I757973e540797b5fb10bea7a2fd1925561655bc9
2015-12-03 16:18:53 +00:00
Robin Lee
b3958d766b Merge "DPMS: Replace ArrayList<>(1) with SingletonList" 2015-12-03 16:12:54 +00:00
Robin Lee
968dea0969 DPMS: Replace ArrayList<>(1) with SingletonList
Change-Id: I78f8230d959f17c3aa2f248122973a8cd5c96693
2015-12-03 14:54:38 +00:00
Jason Monk
8f7f3184d5 Allow QS tiles to open dialogs
Add a TYPE_QS_DIALOG window type, that is in the same layer as
apps and dialogs and such.  It is guarded by having a token
that is granted by SysUI after a click has occured.  If the
app shows a dialog before listening finishes (QS closes) then
the token will stay granted until the tile is removed by the
user, otherwise the token will be removed immediately to avoid
later dialogs.

Also fix a couple tiny TileService issues:
 - Stop/Start listening reversed
 - Fix javadoc referencing wrong action

Change-Id: Iedcdd5fd9a2af2b33eb7f6f17bb0e6c997879876
2015-12-03 09:22:15 -05:00
Clara Bayarri
8469b86e87 Merge "Create work challenge timeout" 2015-12-03 12:04:24 +00:00
Clara Bayarri
56878a9398 Create work challenge timeout
The work challenge should be locked whenever the device goes to sleep + admin
timeout or when the power button is pressed if the lock setting is on.

This change creates the infrastructure to lock a specific user instead of the
device and uses it in these cases. Then, the current code that brings up the
work challenge can check to only show it if the user is locked.

Change-Id: I89b4342b1458d97734d7afa66be52bf04ec3a3d4
2015-12-03 12:01:39 +00:00
Wale Ogunwale
b60206a5e7 Merge "Make sure tap detector is valid before trying to initialize." 2015-12-03 02:18:44 +00:00
Keun-young Park
aa8b1c35ad Merge "Revert "allow locking UI mode and block launching car dock for automotive"" 2015-12-03 02:11:20 +00:00
Keun-young Park
3b741e03b3 Revert "allow locking UI mode and block launching car dock for automotive"
This reverts commit 1746369a6bcd1a7219e94366b3774bfdfff08fc6.

Change-Id: I4989e99b8f648145d0dbfe18e557102939e7d1e3
2015-12-03 02:11:00 +00:00
Wale Ogunwale
abaa4ad84e Make sure tap detector is valid before trying to initialize.
Bug: 25879224
Change-Id: Iefebeec9a0c75fe25d4e2476b797a003670b047a
2015-12-02 17:46:17 -08:00
Keun-young Park
ef3ca438c9 Merge "allow locking UI mode and block launching car dock for automotive" 2015-12-03 01:45:12 +00:00
Chong Zhang
1be3a1cfb9 Merge "Add permission to prevent third-parth apps from querying OOM scores" 2015-12-02 21:02:37 +00:00
Julia Reynolds
eb41dfb383 Merge "Cleanup zen rule instances." 2015-12-02 20:27:12 +00:00
Julia Reynolds
c8e54e8d5e Cleanup zen rule instances.
1. When a user revokes zen access
2. When a user clears data

Bug: 25472361
Change-Id: Ia439a7c2bd6dc07a60a374caf4157508131e3578
2015-12-02 15:24:21 -05:00
Chong Zhang
8e4f4b3d94 Add permission to prevent third-parth apps from querying OOM scores
bug: 25853091
Change-Id: Ic1cdbf155e1e930405773fd078dfc57fda2d9afa
2015-12-02 12:20:30 -08:00
Jeff Sharkey
f23b5d3d6d Merge "API to determine user locked/unlocked state." 2015-12-02 20:16:37 +00:00
Jeff Sharkey
0825ab284c API to determine user locked/unlocked state.
Bug: 25946804
Change-Id: I2b8c8c75fda161a446d79fac811fdd446aa3a4db
2015-12-02 13:14:51 -07:00
Dianne Hackborn
a864049aae Merge "Fix reporting of uid state in battery stats." 2015-12-02 20:05:57 +00:00
Rob Carr
a97268e2b8 Merge "Ensure we update window scale when repositioning child." 2015-12-02 19:45:22 +00:00
Wale Ogunwale
298a4dc8dd Merge "Prevent windows in pinned stack from gaining window focus." 2015-12-02 19:11:03 +00:00
Wale Ogunwale
d045c829a4 Prevent windows in pinned stack from gaining window focus.
Windows in the pinned stack shouldn't receive input keys, so we prevent
they from gaining window focus so the focus/input keys goes to the stack
below the pinned stack.

Also, cleaned up some code.

Bug: 25580816
Change-Id: Iea1f944d167310233c3dbaea140a4ada568bb815
2015-12-02 11:08:46 -08:00
Fyodor Kupolov
9cbfc9e212 Added DISALLOW_RUN_IN_BACKGROUND user restriction
It forces the user to stop instead of going into the background. Also
changed behavior of stopUser method. Now it also attempts to stop related
users along with the specified userId.

Based on ag/807976, with the only difference that it's now a user restriction.

Bug: 24579258
Bug: 24708668
Change-Id: I357298908816fc58feeed83b7e9979fc33d25da6
2015-12-02 10:22:23 -08:00
Wale Ogunwale
6449a9567a Merge "Add bounds information to stack/task WM dump" 2015-12-02 18:13:37 +00:00
Todd Kennedy
35fc197caa Merge "Copy into ASEC container" 2015-12-02 17:34:50 +00:00
Jean-Michel Trivi
24da7bbad2 Merge "Audio focus: uid/pid log info on focus request/abandon" 2015-12-02 17:31:05 +00:00
Philip P. Moltmann
fceeed75ed Merge "Allow print service to specify progress of print and status" 2015-12-02 16:34:58 +00:00
Robin Lee
574f038a57 Resolve merge conflicts of 5ec51457e1 to master.
Change-Id: I70c12ad663c3b4d3b5e3b8f40bc659cb94d82c14
2015-12-02 13:48:32 +00:00
Robin Lee
5ec51457e1 Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" am: 3fe5a65b1c
am: 427edbce96

* commit '427edbce965f62707a2a43d86d70d9d19f6c60dc':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED
2015-12-02 12:47:59 +00:00
Robin Lee
427edbce96 Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
am: 3fe5a65b1c

* commit '3fe5a65b1cc621d40f6278dd1e38d5ec58f92fb6':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED
2015-12-02 12:41:20 +00:00
Robin Lee
3fe5a65b1c Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" 2015-12-02 12:35:14 +00:00
Sungsoo Lim
cac76b722c Merge "Fixed typos: when when" 2015-12-02 06:01:26 +00:00
Sungsoo Lim
0d3d1f825f Fixed typos: when when
Change-Id: I80c0b8817dcbed45071e42d9ffa88bae52a93a81
2015-12-02 14:50:36 +09:00
Svet Ganov
9c165d7601 Add optional permission review for legacy apps - framework
For some markets we have to allow the user to review permissions
for legacy apps at runtime despite them not supporting the new
permission model. This is achieved by showing a review UI before
launching any app component. If an update is installed the user
should see a permission review UI for the newly requested
permissions.

To allow distinguishing which permissions need a review we set
a special flag in the permission flags that a review is required.
This flag is set if a runtime permission is granted to a legacy
app and the system does not launch any app components until this
flag is cleared. Since install permissions are shared across all
users the dangerous permissions for legacy apps in review mode
are represented as always granted runtime permissions since the
reivew requirement is on a per user basis.

Whether the build supports permission review for legacy apps is
determined by a build constant allowing us to compile away the
unnecessary code for markets that do not require a permissions
review.

If an app launches an activity in another app that has some
permissions needing review, we launch the permissions review
UI and pass it a pending intent to launch the activity after
the review is completed.

If an app sends a broadcast to another app that has some permissions
needing review, we do not deliver the broadcast and if the sending
app is in the foreground plus the broadcast is explicit (has a
component) we launch the review UI giving it a pending intent to
send the broadcast after the review is completed.

If an app starts a service in another app that has some permissions
needing review, we do not start the service and if the calling app
is in the foreground we launch the review UI and pass it a pending
intent to start the service after the review is completed.

If an app binds to a service in another app that has some permissions
needing review, we schedule the binding but do not spin the target
service's process and we launch the review UI and pass it a callback
to invoke after the review is completed which spins the service
process and completes the binding.

If an app requests a content provider in another app that has some
permissions needing review we do not return the provider and if
the calling app is in the foreground we show the review UI.

Change-Id: I550f5ff6cadc46a98a1d1a7b8415eca551203acf
2015-12-02 04:23:02 +00:00
Filip Gruszczynski
5746559de1 Merge "Add input method to the tap detection exclude area." 2015-12-02 01:31:47 +00:00
Filip Gruszczynski
912d919772 Add input method to the tap detection exclude area.
Without this touch events on the input method will trigger focus change
if there is a window underneath the input. When focus changes, the input
method will go away too.

Bug: 25930832
Change-Id: I532cb9e78f6fe37b1ddfada75594fc695898a090
2015-12-01 17:30:54 -08:00
Chong Zhang
e7f24e2291 Merge "AMS: add API to IProcessInfoServive for retrieving oom scores" 2015-12-02 01:25:58 +00:00
Chong Zhang
58c270c01b AMS: add API to IProcessInfoServive for retrieving oom scores
bug: 25853091
Change-Id: Ic915191b959afd34d31e8731a7e4aa631a78e45e
2015-12-01 17:21:24 -08:00