Commit Graph

53789 Commits

Author SHA1 Message Date
George Mount
895eaa453e Merge "Revert "Choose the correct Fragment to pull a Transiton from."" 2015-12-03 19:10:08 +00:00
George Mount
c30d875c7f Revert "Choose the correct Fragment to pull a Transiton from."
This reverts commit fbaa14bc35.

Change-Id: Ic6953554a97bf125a69209b1db973d7fc48ab31b
2015-12-03 19:09:17 +00:00
Chris Tate
c169181747 Merge "Improve docs for Parcelable.describeContents()" 2015-12-03 19:00:47 +00:00
Wale Ogunwale
69970ceb71 Merge "Set proper stack in WM when activity is moved to stack in AM" 2015-12-03 18:51:13 +00:00
Adam Skory
a1d8f42fcd Merge "Make isAppProvidedWebUri false from setDefaultIntent()" 2015-12-03 18:29:05 +00: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
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
Neil Fuller
568f4de11a Merge "Fix @code escapes" 2015-12-03 09:44:01 +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 1746369a6b.

Change-Id: I4989e99b8f648145d0dbfe18e557102939e7d1e3
2015-12-03 02:11:00 +00: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
Adam Skory
a5381085d3 Make isAppProvidedWebUri false from setDefaultIntent()
Just assign mUri directly instead of calling setUri()
to avoid flipping mIsAppProvidedWebUri to true exactly
when it shouldn't be.

Also, make sure the boolean gets un/parceled.

Bug: 25952056

Change-Id: I973e585d04a73c2b7eab5975ea7f2b447b270c26
2015-12-02 17:43:19 -07:00
Christopher Tate
d1f09e2b43 Improve docs for Parcelable.describeContents()
Make the meaning of CONTENTS_FILE_DESCRIPTOR more explicit, and
emphasize that describeContents() applies to the current object
instance, not to the class generically.

Change-Id: Ie5010e24c2e57bdc6c982249adb9d4c871d46f5a
2015-12-02 16:30:15 -08:00
John Reck
c8aad06efe Merge "Nuke HardwareRenderer abstract base" 2015-12-02 23:54:01 +00:00
John Reck
51aaf906f9 Nuke HardwareRenderer abstract base
Bug: 17303292

Change-Id: I4a272ea4f695f4f9993e8be640fdd8530b691be0
2015-12-02 15:46:11 -08:00
Todd Kennedy
a6f0aa5785 Merge "Fix SplitTests CTS test" 2015-12-02 22:51:58 +00:00
Todd Kennedy
3398be854a Fix SplitTests CTS test
A recent change tightened the check for whether or not an APK has code.
The check verified against the application and not the individual split.

Bug: 25769800
Change-Id: Ia53bd0e31ce3379bdd8bfe6d0c3da99b6d65fe31
2015-12-02 13:56:04 -08:00
Roozbeh Pournader
47040d6247 Merge "Make Hyphenator load Spanish hyphenation patterns" 2015-12-02 21:19:48 +00:00
Vladislav Kaznacheev
9bc00f1997 Merge "Add extras to ClipDescription" 2015-12-02 20:52:04 +00:00
Julia Reynolds
eb41dfb383 Merge "Cleanup zen rule instances." 2015-12-02 20:27:12 +00:00
Roozbeh Pournader
c7dcec43d6 Make Hyphenator load Spanish hyphenation patterns
The pattern files themselves are added to the
external/hyphenation-patterns repo.

Change-Id: Icf37191f1217b7869f49f8ea63174341662caacf
2015-12-02 12:25:07 -08: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
Sunny Goyal
ac7579a6e5 Merge "Adding context flag to open database with no localized collators" 2015-12-02 20:17:29 +00: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
Chris Tate
3e94c8bcc3 Merge "Relax null parameter enforcement for legacy apps" 2015-12-02 19:38:44 +00:00
Christopher Tate
bb76a6ce16 Relax null parameter enforcement for legacy apps
No longer throws when calling cancel() with a null PendingIntent if
the app targets SDK < NYC.

Bug 25798631

Change-Id: Ic91f42808811645b01802abcc785f4218aac0e8b
2015-12-02 11:17:09 -08:00
Sunny Goyal
a21e6b2fac Adding context flag to open database with no localized collators
Bug: 25956606
Change-Id: I209a8d18a7e83c1af54309fae8607f8b46772196
2015-12-02 11:11:37 -08:00
Wale Ogunwale
298a4dc8dd Merge "Prevent windows in pinned stack from gaining window focus." 2015-12-02 19:11:03 +00:00
Vladislav Kaznacheev
ddb4bdecfc Add extras to ClipDescription
This is required to expand metadata capabilities of DragEvent.
Apps receiving ACTION_DRAG_* events have access to
ClipDescription, but not ClipData.

Adding extras to ClipDescription allows for a richer behavior of apps
responding to these events.

Bug: 25788641
Change-Id: I07e374f71d16f8441dc3a0b02c7d833e0139b74b
2015-12-02 11:09:39 -08:00
Selim Cinek
7943316678 Merge changes I2af07b57,Ic0a774e8,Ica3d21ff,Id4c3c901
* changes:
  FalsingManager Quick settings fix
  Fixed a bug where the panel could be too small in certain cases
  Fixed a bug where the margins where not updated correctly
  Fixed the handling of the expand on the lockscreen
2015-12-02 19:08:58 +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
ec7416713c Merge "Added DISALLOW_RUN_IN_BACKGROUND user restriction" 2015-12-02 18:27:26 +00: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
Keisuke Kuroyanagi
abe0e508aa Merge "Refactoring: SelectionHandleView." 2015-12-02 18:18:58 +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
Neil Fuller
71fbb81b14 Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
2015-12-02 14:24:11 +00: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
Keisuke Kuroyanagi
5d7657e99b Refactoring: SelectionHandleView.
Remove code duplication in SelectionStartHandleView and
SelectionEndHandleView by introducing SelectionHandleView.

Change-Id: I4486019714b13d184a72cf7ee60c346c4d8b5f5a
2015-12-01 17:30:51 -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
Dianne Hackborn
a8d10945a6 Fix reporting of uid state in battery stats.
Now that the activity manager keeps track of per-uid process states,
we can push that already rolled-up data into battery stats to directly
track the times in those states.

The problem with the reporting was actually that we weren't dealing
correctly with negative process states, which is now fixed.  (It was
interpreting them as FOREGROUND rather than not running.)

Also split out a number of new states -- TOP, FOREGROUND_SERVICE,
TOP_SLEEPING -- from FOREGROUND.  This should allow us to get a much
better idea of how much an app has been actively in use: TOP is when
it is directly visible to the user or in use by such, FOREGROUND_SERVICE
is when it is running in the background in a way the user is aware of.
Also when reporting these numbers, they are no longer added together as
reported but kept as separate times.

Change-Id: I6d307503a4b4ad5c0d5d49305ef63f8eb858e2c9
2015-12-01 16:53:28 -08:00
Philip P. Moltmann
b3078c235e Allow print service to specify progress of print and status
The status has always been there in error cases, it is now also visible
in non-error cases.

If the progress is not set, no progress bar is shown.

Bug: 24135025
Change-Id: Iea23f45d236365433c6f6739597833d236ed6d19
2015-12-01 15:42:49 -08:00
Steve McKay
578b36e414 Merge "Don't copy a directory into itself...doesn't go well." 2015-12-01 23:07:37 +00:00
Steve McKay
d3afdeebeb Don't copy a directory into itself...doesn't go well.
Minimally deform CopyService such that we can listen
    to the completion of operations in the test.
Add test coverage.
Add equals and hashcode to DocumentInfo...so we can compare
    the heck out of 'em. + a test.
WIP: Expose (@hide style) DocumentsProvider.isChildDocument via
    DocumentsContract. Use that to check for recusive copies.

Bug: 25794511

Change-Id: I05bb329eb10b43540c6806d634e5b96a753e8178
2015-12-01 14:16:38 -08:00
Selim Cinek
a89ef23e8c Fixed a bug where the margins where not updated correctly
When updating a notification, the end margin was not
correctly updating, leading to overlapping text with
the image.

Change-Id: Ica3d21ff0268105d0a8a73527b8dad0225e12d5a
2015-12-01 13:04:31 -08:00
Chad Brubaker
7845e44c0c Don't use IntegralToString
Fix master build

Change-Id: I084ada7ccf54ab1708306ad2a412d8a09f78dec4
2015-12-01 13:03:41 -08:00