Svetoslav
80dcc684a4
am d5d58a7d: am 857c3019: Merge "Do not allow opting out from the new permission model." into mnc-dev
...
* commit 'd5d58a7d269deff73efdef8cb5d70bfd6988a6b7':
Do not allow opting out from the new permission model.
2015-05-14 02:27:48 +00:00
Mikhail Naganov
d944bf3702
am 16bfbbba: am 822f1aaf: Merge "Update the new error reporting API in android.webkit" into mnc-dev
...
* commit '16bfbbba69e781bc6f52d332e1fabad979133d0a':
Update the new error reporting API in android.webkit
2015-05-14 02:09:29 +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
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
Amith Yamasani
3d6465fa97
am d1706063: am 3d32a1c0: Merge "Allow settings to change app inactive state" into mnc-dev
...
* commit 'd170606319e10d1140cb58d6f959efb91d162441':
Allow settings to change app inactive state
2015-05-14 01:46:49 +00:00
Dianne Hackborn
b49e9f4fda
am 8fb32071: am c352722e: Ignore small time changes in alarm manager.
...
* commit '8fb320717510e0703e99299f7df4543fbafcab02':
Ignore small time changes in alarm manager.
2015-05-14 01:46:15 +00:00
Jorim Jaggi
9b771dfd8f
am be2c7449: am 6a587acd: Merge "Fix fingerprint for multiuser" into mnc-dev
...
* commit 'be2c7449b9679f357d368805a1a24e05de4f53a0':
Fix fingerprint for multiuser
2015-05-14 01:45:43 +00:00
Chris Tate
0ae8fa7502
am 7b566da5: Merge "AlarmClockInfo: fix redundant word in doc comment"
...
* commit '7b566da55afad480622c328d658f0e654019688d':
AlarmClockInfo: fix redundant word in doc comment
2015-05-14 01:44:25 +00:00
Mikhail Naganov
822f1aaf2b
Merge "Update the new error reporting API in android.webkit" into mnc-dev
2015-05-14 01:43:48 +00:00
Mikhail Naganov
8d4f07f8d3
Update the new error reporting API in android.webkit
...
- minor changes in WebResourceError;
- prepare to remove WebResourceResponseBase;
- add immutable mode to WebResourceResponse.
Bug: 21063767
Change-Id: Iaf5f92e3850732c7a888453468e108809b3b782a
2015-05-13 18:40:20 -07:00
Amith Yamasani
901e924392
Allow settings to change app inactive state
...
Change-Id: I57efb4b5fa69c9a268025fb1ef83de36c4cc83ca
2015-05-13 18:21:33 -07:00
Chris Tate
7b566da55a
Merge "AlarmClockInfo: fix redundant word in doc comment"
2015-05-14 01:20:53 +00:00
Shuhrat Dehkanov
66729ff685
AlarmClockInfo: fix redundant word in doc comment
...
Removed one of unintentional double "intent"s.
Change-Id: I0ce4224964afae0587ce55b6b4775370eff89d26
Signed-off-by: Shuhrat Dehkanov <k@efir.uz >
2015-05-14 10:07:25 +09: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
Svet Ganov
59a49c0309
am a82e4878: am 67b7ec28: Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
...
* commit 'a82e48785aa283f2bb7b35cf40be75dcd2ba3909':
Access mock location is no longer a runtime permission - framework
2015-05-14 00:43:32 +00:00
Alan Viverette
b0b80305ab
am c6b6dd84: am bf6d50f9: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev
...
* commit 'c6b6dd84fed5522ef01bd733f88b4e2a3110e820':
Call dispatchFinishTemporaryDetach before returning a transient view
2015-05-14 00:43:10 +00:00
Dianne Hackborn
007324bf82
am 7f2b9b05: am 4f5e0248: Merge "Hide getPackageProcessState(), it is not ready yet." into mnc-dev
...
* commit '7f2b9b0548797122b63801342085a96a4891c6a9':
Hide getPackageProcessState(), it is not ready yet.
2015-05-14 00:42:30 +00: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
Alan Viverette
bf6d50f906
Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev
2015-05-13 23:35:55 +00:00
Dianne Hackborn
4f5e024875
Merge "Hide getPackageProcessState(), it is not ready yet." into mnc-dev
2015-05-13 23:29:30 +00:00
Selim Gurun
b5f503c8d1
am e2b5e7bb: am af9d60af: Merge "Address API feedback for PostMessage" into mnc-dev
...
* commit 'e2b5e7bb163a8fcc6ed02d8c68f53fe7986c4b3e':
Address API feedback for PostMessage
2015-05-13 22:56:10 +00:00
Nick Kralevich
50f7e18462
am 882b8829: am 9831fad6: Merge "Modify how USB connections are handled." into mnc-dev
...
* commit '882b882957a389bef910437eb59353e08ec09a5f':
Modify how USB connections are handled.
2015-05-13 22:56:00 +00: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
Selim Gurun
af9d60af0d
Merge "Address API feedback for PostMessage" into mnc-dev
2015-05-13 22:37:02 +00:00
Jorim Jaggi
53edbb1aee
am 1a4df69f: am 645edef4: Merge "Make sure the app can draw a frame before unlocking" into mnc-dev
...
* commit '1a4df69f4c4a63b943f3f4f4102e957adbc3e341':
Make sure the app can draw a frame before unlocking
2015-05-13 22:34:47 +00:00
Yohei Yukawa
bef7b79b0d
am d21eeb8f: am 5ad7fe49: Merge "Update IME focus when the active view is losing the focus." into mnc-dev
...
* commit 'd21eeb8ff57c6b93d6170a34c10515455f5cac0c':
Update IME focus when the active view is losing the focus.
2015-05-13 22:34:36 +00:00
Hui Shu
d484d68d89
am 8b5a2421: am 7b1b3613: Merge "Address API council feedback for setOffscreenPreRaster." into mnc-dev
...
* commit '8b5a242132cf317319521c546af18db476e884fc':
Address API council feedback for setOffscreenPreRaster.
2015-05-13 22:34:26 +00:00
Nick Kralevich
9831fad676
Merge "Modify how USB connections are handled." into mnc-dev
2015-05-13 22:31:57 +00:00
Dianne Hackborn
b725894d05
Hide getPackageProcessState(), it is not ready yet.
...
Change-Id: I188c647573207e89510174e3ad56ca0c19e5ece3
2015-05-13 15:27:23 -07:00
Nancy Chen
3b8d8f761a
am e8f1f899: am 78250907: Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev
...
* commit 'e8f1f899a127bc6c809f635b70be434c51cf6415':
Add phone account field for voicemail to distinguish the source.
2015-05-13 22:21:46 +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
Yohei Yukawa
5ad7fe4930
Merge "Update IME focus when the active view is losing the focus." into mnc-dev
2015-05-13 22:10:37 +00:00
Hui Shu
7b1b3613b9
Merge "Address API council feedback for setOffscreenPreRaster." into mnc-dev
2015-05-13 22:07:55 +00:00
Nancy Chen
782509076b
Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev
2015-05-13 21:54:48 +00:00
Kenny Guy
bd5d3a03ed
am a6e65d2c: am 467eb056: Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
...
* commit 'a6e65d2ce7aa084732a592c71f4679f433efdc89':
Allowing profile to set a subset of keyguard restrictions.
2015-05-13 21:34:22 +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
Selim Gurun
0a814b61e3
Address API feedback for PostMessage
...
Bug: 21043955
Add anchor tags, and hide the constructor for WebMessagePort.
Change-Id: Ibd2e15581c06be9015a3cd7c7741edf6657d4552
2015-05-13 14:14:14 -07:00
Jeff Sharkey
06defabf3d
am cddcdf88: am c968e219: Merge "Determine if we have adoptable disks." into mnc-dev
...
* commit 'cddcdf8824a13923118bd0c9d19dd7487ebb7f96':
Determine if we have adoptable disks.
2015-05-13 21:13:23 +00: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
Jeff Sharkey
c968e21937
Merge "Determine if we have adoptable disks." into mnc-dev
2015-05-13 20:57:03 +00:00
Jeff Sharkey
0d838a0fad
Determine if we have adoptable disks.
...
Bug: 19993667
Change-Id: I9b21b05736c22d34ca22f5ad6e1a6ebec440cfb6
2015-05-13 13:54:35 -07:00
Jorim Jaggi
8fd6d67155
am 0d56be54: am 131a19ee: Merge "Persist fingerprint names" into mnc-dev
...
* commit '0d56be54e729adc0d2f568e9679ec15e1a172366':
Persist fingerprint names
2015-05-13 20:48:40 +00:00
Todd Kennedy
983f5bb1dc
am b2a3ad24: am d90bf462: Merge "Don\'t negate saving state" into mnc-dev
...
* commit 'b2a3ad246fd3a499c64c154490765eb76384d66d':
Don't negate saving state
2015-05-13 20:48:36 +00:00
Jorim Jaggi
131a19ee6f
Merge "Persist fingerprint names" into mnc-dev
2015-05-13 20:32:31 +00:00
Julia Reynolds
b8fb725f0a
am f7056dbd: am 396d9440: Merge "Remove initiator name param." into mnc-dev
...
* commit 'f7056dbd307d64bdd3a5e09613ddc83bf9e06091':
Remove initiator name param.
2015-05-13 20:31:12 +00:00
Kenny Root
959de774dc
am ca549d9c: am f5d758c0: Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev
...
* commit 'ca549d9c2fa24bd322b4a75e720ab15928af0e57':
Start handshake before calling hostname verifier, part 2
2015-05-13 20:31:08 +00:00
John Spurlock
fe4b843390
am 9e957b1b: am fb13d497: Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev
...
* commit '9e957b1b25bd417ef111f90a8eeb4b6a0a861874':
Zen: Use shorter version of countdown condition summary in footer.
2015-05-13 20:31:03 +00:00