26464 Commits

Author SHA1 Message Date
Xiaohui Chen
55a302402b Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev 2015-05-14 21:05:36 +00:00
Craig Mautner
e0570201f5 Lock top task if whitelisting arrives after start.
If the DevicePolicyManagerService updates the whitelist after a task
in the whitelist has started then the task won't have started locked.

When the updated whitelist arrives this change automatically locks the
topmost task if it is in the whitelist.

Also more locktask debugging.

Fixes bug 21031298.

Change-Id: I2494af6f2819ca91bc01abc5decb3d1adc088226
2015-05-14 12:54:23 -07:00
Daniel Sandler
9cb90cbbf8 Merge "Revert "Icon support comes to Notification."" into mnc-dev 2015-05-14 16:34:53 +00:00
Daniel Sandler
09e51a739f Revert "Icon support comes to Notification."
This reverts commit 08a04c15245c970856022d0779aa27d4d63cdee3.
This also reverts commit 5bcbf857d129f4513e562801a4e88077b2655ade.

Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
2015-05-14 12:23:24 -04:00
Paul McLean
f799491fb4 Merge "New policy for internal and wired device names." into mnc-dev 2015-05-14 15:59:38 +00:00
Paul McLean
fc56b88ac4 Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev 2015-05-14 15:59:20 +00:00
Lorenzo Colitti
9e2d14beb3 Merge "Don't display the "no Internet access" prompt on captive portals." into mnc-dev 2015-05-14 15:07:10 +00:00
Lorenzo Colitti
d49159f4e9 Don't display the "no Internet access" prompt on captive portals.
Bug: 20081183
Bug: 21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586
2015-05-14 23:46:16 +09:00
Rubin Xu
6e1c17a3df Merge "clear caller identify before sending system update notification" into mnc-dev 2015-05-14 14:00:18 +00:00
Rubin Xu
2c84cc2ea2 clear caller identify before sending system update notification
Because DeviceAdminReceiver is protected by BIND_DEVICE_ADMIN permission,
in order to send broadcast to it, we need to clear the caller's identity
and call sendBroadcastAsUser() as system.

Bug: 20213644
Change-Id: Icc7b239b9005e286012ade6580ec92a0a57198e0
2015-05-14 13:48:35 +01:00
Wojciech Staszkiewicz
9e9e2e73c6 Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-14 10:24:34 +01:00
Robin Lee
39087b1cec Replace String host:port/url args with Uri arg
Uri provides a stronger guarantee of well-formedness and lets apps do
nice extra things like specifying scheme etc. without twisting any
expectations.

Bug: 20820034
Change-Id: Ia6bbedb74765444920b667d643fb7e1eb6a7292b
2015-05-14 07:15:18 +01:00
Dan Sandler
08a04c1524 Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

Bug: 18568715
Change-Id: I4377b311c538bd1cf36b3fba22326bae81af40c9
2015-05-13 23:50:43 -04:00
Jeff Brown
0d3b6dbc4c Merge "DO NOT MERGE - Overlay display now support multiple modes." into mnc-dev 2015-05-14 02:52:09 +00:00
Jaesung Chung
f5edb20ae9 Merge "TIF: Add DVB device handling to TvInputManagerService" into mnc-dev 2015-05-14 02:14:37 +00:00
Svetoslav
857c3019ba Merge "Do not allow opting out from the new permission model." into mnc-dev 2015-05-14 02:04:30 +00:00
Jaesung Chung
58739e7584 TIF: Add DVB device handling to TvInputManagerService
Added an API to pass an open file descriptor of DVB devices and
addressed the security issue of setting the permissions on DVB devices
to 0666.

Bug: 20436120
Change-Id: I4649e76084f3356ec22b7e776fb87c6a8fdc00d6
2015-05-14 02:00:06 +00:00
Svetoslav
d965370398 Do not allow opting out from the new permission model.
bug:20525775

Change-Id: I84cd4587db5adb96f6f29148adb242905f53f2dc
2015-05-13 18:54:57 -07:00
Wale Ogunwale
8a2978c9ab Merge "Don't stop animation when starting windows app token changes" into mnc-dev 2015-05-14 01:51:50 +00:00
Wale Ogunwale
8ebc82a63f Don't stop animation when starting windows app token changes
If another activity is starting while we are still animating
the starting window of the previous activity to start, we
transfer the starting window of the old activity to the one that
is currently starting so we don't have to create another starting
window and also to reduce jank from the starting window animation
appearing to restart.

However, there were several conditions that led to the starting
window animation stopping when the transfers app tokens

1. Starting window animator not been removed from the previous
app token animator causing it to finish/remove the starting window
prematurily.
2. Starting window animator not been properly added to the new
app token animator causing the animation not be be picked up.
3. WMS.mSkipAppTransitionAnimation been set to false regardless of if
an app transition was actually prepared in WMS.prepareAppTransition()
4. WMS.mSkipAppTransitionAnimation not been set to true in all cases
where the starting window transfers tokens even though we don't want the
new app to do any transition animation is the starting window is
animating.
5. New app not setting its animation to dummy animation when the next
transition should be skipped due to starting window still animating.
6. Starting window animation been cleared for the new app in
WMS.handleAppTransitionReadyLocked() even for cases where we transferred
the animation from the previous app.

Also, cleaned up some code.

Bug: 20953232
Change-Id: I714d6bdfcdaeeaac29f9d464bab9f3e9c192e937
2015-05-13 18:45:36 -07:00
Amith Yamasani
3d32a1c04d Merge "Allow settings to change app inactive state" into mnc-dev 2015-05-14 01:24:29 +00:00
Fabrice Di Meglio
aef477a65e Merge "Add IntentFilter auto verification - part 11" into mnc-dev 2015-05-14 01:21:57 +00:00
Amith Yamasani
901e924392 Allow settings to change app inactive state
Change-Id: I57efb4b5fa69c9a268025fb1ef83de36c4cc83ca
2015-05-13 18:21:33 -07:00
Fabrice Di Meglio
b371c7b6e2 Add IntentFilter auto verification - part 11
- tune Intent resolution candidates filtering: add also the undefinedList
  into the results at first so that when you install an App which is not
  verified (after installing a verified App) you will still have the
  Disambiguation Dialog prompted to the User.

See bug #19628271

Change-Id: I611fff4c1c7f60db22312d7948c8d5120719fbd0
2015-05-13 18:17:12 -07:00
Dianne Hackborn
c352722e8a Ignore small time changes in alarm manager.
It turns out switching to the new kernel alarm
reporting causes lots and lots of spurious flags
that the clock has changed.  The alarm manager
would blindly trust these, thinking the world has
changed on it and recomputing everything and reporting
this to everyone else.  This was expensive.

We now verify that the time has changed sufficiently
that it is worth caring about.  This is basically the
same algorithm that battery stats was using to avoid
recording small clock changes, so we are really just
pushing this down into the alarm manager and can now
remove that from battery stats.

Also since we are getting these so much, make use of
the other information in about the wakeup that tells us
if an alarm went off to avoid doing anything if it didn't.

Change-Id: I6f4f4226db6eb2b38ca73860786e7cf7c9136cc3
2015-05-13 17:44:05 -07:00
Jorim Jaggi
6a587acd1d Merge "Fix fingerprint for multiuser" into mnc-dev 2015-05-14 00:36:03 +00:00
Svet Ganov
67b7ec2887 Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev 2015-05-13 23:45:23 +00:00
Jorim Jaggi
aa4d32add7 Fix fingerprint for multiuser
Change-Id: Iab18c4de9764da1a65490b186b33535f8e79e1e5
2015-05-13 16:35:56 -07:00
Fabrice Di Meglio
fe112e7b38 Merge "Add IntentFilter auto verification - part 10" into mnc-dev 2015-05-13 23:20:47 +00:00
Fabrice Di Meglio
649efc68cb Add IntentFilter auto verification - part 10
- tune Intent resolution candidates filtering: remove the undefinedList
from the results and then add it again it there is no more candidates.

See bug #19628271

Change-Id: I9ab077f6a431367be8bab30c134d34e1e7ac51ed
2015-05-13 16:17:11 -07:00
Paul McLean
338f27ab28 New policy for internal and wired device names.
For internal and unknowable wired devices, return the product name (i.e. "Nexus 7").
For connected devices with manufacturer-supplied product names, return those.
Change getName() to getProductName().

Bug: 20880296
Change-Id: I67ef3d4c73b3acab368b0879faa26fa9127c21bb
2015-05-13 15:41:00 -07:00
Svet Ganov
f7e9cf4fb4 Access mock location is no longer a runtime permission - framework
The access mock location is no longer a runtime permission. It is a
signature protected one that apps cannot get but the fact they request
it means they want to inject location into the system. Now the user
gets to choose the current mock location app in developer options from
the apps that request the mock location permission. The access to mock
location is no longer guarded by the permisson but from a new app op
which is off by default and the settiings UI sets it to enabled only
for the currently selected mock location app.

bug:21078873

Change-Id: I19e3f9dc7c7de82eab46b30fec1abfbca54a0e59
2015-05-13 15:37:21 -07:00
Nick Kralevich
9831fad676 Merge "Modify how USB connections are handled." into mnc-dev 2015-05-13 22:31:57 +00:00
Jorim Jaggi
645edef483 Merge "Make sure the app can draw a frame before unlocking" into mnc-dev 2015-05-13 22:13:27 +00:00
Nick Kralevich
fcf10f7c12 Modify how USB connections are handled.
* Introduce a new "charger only" mode. In this mode, MTP is disabled,
and no file transfers can occur.
* Make charger only mode the default.
* Modify "persist.sys.usb.config" so it now only holds the adb status.
* Make the USB settings non-persistent. Unplugging the USB connection will
reset the device back to "charger only" mode.
* Fixup wording per UI guidelines.

TODO: Re-implement MDM restrictions for USB / MTP access controls.

Bug: 18905620
Change-Id: I99a50d9132a81e98187f431166fd9fef4d437e4f
2015-05-13 14:28:13 -07:00
Jorim Jaggi
827e0facfe Make sure the app can draw a frame before unlocking
- The mechanism to stop windows drawing while window animator was
animating was somehow flaky. It relied on the fact that the client
would call relayout() whenever the animating state changed. This is
mostly the case, but not for lockscreen animations. Instead, we now
use a push model, where window manager tells the app that the state
has changed.
- In addition, it only stopped drawing if that window was animating,
but then only resumed drawing after all windows have finished
animating. Now, we do this per window, so we only stop drawing for
windows that are currently animating.
- We resume the top activity now at the very beginning of the
unlocking sequence. This gives the app a chance to draw a frame
before the user sees anything. If it's to slow, then we just use the
outdated framebuffer.

Bug: 19964562
Change-Id: Ifef8abd189a3146d854b81b9b948861e4d38c155
2015-05-13 14:23:05 -07:00
Kenny Guy
467eb0566f Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev 2015-05-13 21:07:17 +00:00
Xiaohui Chen
ac531941fb wallpaper: avoid exception when user is not initialized
Bug: 21087887
Change-Id: I56b9bf08c6e7100589f0df116e9d20f2f77d50e8
2015-05-13 13:34:40 -07:00
Jorim Jaggi
131a19ee6f Merge "Persist fingerprint names" into mnc-dev 2015-05-13 20:32:31 +00:00
Jorim Jaggi
ee77cebc1a Persist fingerprint names
Bug: 20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535
2015-05-13 13:25:26 -07:00
Julia Reynolds
396d944001 Merge "Remove initiator name param." into mnc-dev 2015-05-13 20:14:44 +00:00
John Spurlock
2047ce8240 Merge "Zen: Serialize notify conditions calls, defer subscription." into mnc-dev 2015-05-13 19:06:10 +00:00
Amith Yamasani
59a5733adf Merge "Track app idle history and dump it" into mnc-dev 2015-05-13 18:52:30 +00:00
Amith Yamasani
0a11e69428 Track app idle history and dump it
"dumpsys usagestats history" will show the
active state of each app for the last 100 hours,
if the device hasn't rebooted.

Bug: 20066058
Change-Id: I703e5bc121298e4363c202da56fffb0b8534bcaf
2015-05-13 11:49:35 -07:00
John Spurlock
a7d92b19c0 Zen: Serialize notify conditions calls, defer subscription.
- Don't subscribe/unsubscribe to new rules until the config has
   been set, avoids race conditions.
 - Process all condition updates on the same thread.
 - Add the schedule provider's next alarm state to dumpsys.

Bug: 21111868
Change-Id: I389f4a4905a56d6c976f01408f48f87230109aba
2015-05-13 14:48:02 -04:00
Chad Brubaker
83ce095c84 Add keystore onUserAdded/Removed methods
(cherry-picked from commit 31c2897105e6d71f8e6edeab312d2147bbdbaeb1)

Change-Id: I73fe9344ec5660e58425d5c85d14381820533d57
2015-05-13 10:57:42 -07:00
Paul McLean
20eec5bb79 Add manufacturer-provided device name for AudioPort name field for BT devices.
Change "a2dp-device" to empty string for EnumAPI.

Bug: 20880296
Change-Id: If377735b6d552bb929e5881743bcc3c9a2afb9e3
2015-05-13 10:18:47 -07:00
Wei Liu
8e4799ad45 resolved conflicts for merge of f0c4f0dd to mnc-dev
Change-Id: I16df088016c010aa25ee73ea8e68b3db8c0449e3
2015-05-13 09:57:33 -07:00
Stefan Kuhne
4d89374483 Merge "Ensure activity visiblity when moving task" into mnc-dev 2015-05-13 16:04:46 +00:00
John Spurlock
e1d0188b69 Merge "Zen: Map external ringer mode = silent to zen = alarms." into mnc-dev 2015-05-13 15:49:32 +00:00