22203 Commits

Author SHA1 Message Date
Simranjit Singh Kohli
adc62efba6 am 91b5550e: am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
* commit '91b5550ee724bf0e41149decd55fd9ca2a3b3797':
  [RemoveAccount API]: Adding support for intent.
2014-11-13 19:32:47 +00:00
Simranjit Singh Kohli
91b5550ee7 am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev
* commit 'fdcdb7429e3f150818e8df561a62328444b102c5':
  [RemoveAccount API]: Adding support for intent.
2014-11-13 19:24:10 +00:00
Simranjit Singh Kohli
fdcdb7429e Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-dev 2014-11-13 19:18:30 +00:00
RoboErik
0f17d95e6f am 9e070715: am f338fcba: Merge "Use the suggested stream if it\'s currently active" into lmp-mr1-dev
* commit '9e0707155f094e20804c30f18083615530e1fc0d':
  Use the suggested stream if it's currently active
2014-11-13 18:06:14 +00:00
RoboErik
9e0707155f am f338fcba: Merge "Use the suggested stream if it\'s currently active" into lmp-mr1-dev
* commit 'f338fcbae53987a5db77b774049d1128964fe880':
  Use the suggested stream if it's currently active
2014-11-13 18:00:26 +00:00
RoboErik
f338fcbae5 Merge "Use the suggested stream if it's currently active" into lmp-mr1-dev 2014-11-13 17:55:06 +00:00
Craig Mautner
759d34cbd0 am 316e369c: am 30bd3bb7: Revert "Debug for bug 18017409"
* commit '316e369c4c053125faf9c78d42855f257cfe48a2':
  Revert "Debug for bug 18017409"
2014-11-13 16:55:07 +00:00
Craig Mautner
316e369c4c am 30bd3bb7: Revert "Debug for bug 18017409"
* commit '30bd3bb77b8bd1ac70723bcf7f1017fc40ea89b2':
  Revert "Debug for bug 18017409"
2014-11-13 16:50:48 +00:00
Craig Mautner
30bd3bb77b Revert "Debug for bug 18017409"
The bug has been fixed. No longer needed.

This reverts commit 5a3c231dc832c205d2bb2f7f0881925b92c9e5e2.

Change-Id: I4a0dda5321f4eeb989c4c58951c43c8d62fd3664
2014-11-13 08:45:39 -08:00
John Spurlock
25c3421c5e Zen: Update condition text for current condition.
If the provider sends us an updated summary (or other text)
for the currently selected exit condition, update the UI and
persisted condition.

Update the downtime condition text (end time/line2 + summary)
when the next alarm changes (if downtime = none).

Also, clear the fired-alarm cache on time or time-zone resets.

Bug: 16373455
Change-Id: Ib38c52104a281fcc04a89612b643a219fd82b40b
2014-11-13 11:03:10 -05:00
Jeff Brown
24c1d664c4 Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev 2014-11-13 07:04:54 +00:00
Jeff Brown
a191aa99ab Remove an unnecessary condition from previous change.
Change-Id: Ib966fbb373294ad60caf7f1d9cbb7fafd05ded6b
2014-11-12 23:01:12 -08:00
Jeff Brown
1cbff0e310 Merge "Improve screen brightness boost behavior." into lmp-sprout-dev 2014-11-13 06:58:03 +00:00
Jeff Brown
7b5be5e2a7 Improve screen brightness boost behavior.
Wake-up when entering brightness boost mode, don't boost in ambient
mode since some display device drivers do strange things in that mode and
boost doesn't work.  Waking up feels more natural as well.

Don't flutter the power HAL's interactive mode bit simply due to changes
in display ready state since that may result in visible artifacts
such as display flashes.

Don't stop the auto-brightness sensor while temporarily boosted.

Don't prevent the display from entering the ready state while in brightness
boost since that would unnecessarily delay the transition from DOZING to AWAKE
until boost is finished.

Restart the user activity timeout when brightness boost ends and prevent
the display from dimming while boosted.

The pixel fairies basked in the sunlight.

Bug: 18262044
Bug: 18261782
Change-Id: I8c42a1e6091b0fe1253e90265ac248087ebc24e1
2014-11-12 18:49:36 -08:00
Jeff Sharkey
bea6648df5 am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit 'a2781fdac332c4f6277a986c88e34daa25a3b5f9':
  Recover apps with malformed certificates.
2014-11-12 23:50:47 +00:00
Sandeep Siddhartha
41dc467957 am 5f02d295: Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev automerge: 850ec91
* commit '5f02d29550588a17add0b83f7e7bfcd324f20778':
  Don't unload the sound model on stopRecognition
2014-11-12 23:39:50 +00:00
Ye Wen
bdc3a46312 Delay connecting to MmsService until APIs are called for imms
Eagerly connecting to MmsService in MmsServiceBroker during system
bootup caused a 2-second delay. Removing the connection in this CL. The
connection will be made when any of the API is called.

b/18085396

Change-Id: I201abcb5f8c5ac69e347e2c69fd20b8215bb0654
2014-11-12 15:15:49 -08:00
Jeff Sharkey
a2781fdac3 am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit '521ca5f8fba355f526e82dc3a8fc6520e4379874':
  Recover apps with malformed certificates.
2014-11-12 22:54:47 +00:00
Jeff Sharkey
521ca5f8fb am 2e700004: am d68b87cd: Recover apps with malformed certificates.
* commit '2e7000040e3d836bb591e29515974817afc49488':
  Recover apps with malformed certificates.
2014-11-12 22:24:24 +00:00
Jeff Sharkey
2e7000040e am d68b87cd: Recover apps with malformed certificates.
* commit 'd68b87cdd402d46013170d9316a31c82be4e4816':
  Recover apps with malformed certificates.
2014-11-12 22:20:46 +00:00
Wale Ogunwale
2a32d9f6d3 resolve merge conflicts of 2755644 to lmp-mr1-ub-dev.
automerge: 89b3ecc

* commit '89b3ecc7b38f9e0601c36176834a66af0f825193':
  Fix build breakage from missing close brace.
2014-11-12 22:15:08 +00:00
Nick Kralevich
451a6f8f9a fix crash on invalid base64 key
An invalid adb public key can cause a system server crash.

  AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: android.fg
  AndroidRuntime: java.lang.IllegalArgumentException: bad base-64
  AndroidRuntime:        at android.util.Base64.decode(Base64.java:161)
  AndroidRuntime:        at android.util.Base64.decode(Base64.java:136)
  AndroidRuntime:        at com.android.server.usb.UsbDebuggingManager.getFingerprints(UsbDebuggingManager.java:235)
  AndroidRuntime:        at com.android.server.usb.UsbDebuggingManager.access$500(UsbDebuggingManager.java:49)
  AndroidRuntime:        at com.android.server.usb.UsbDebuggingManager$UsbDebuggingHandler.handleMessage(UsbDebuggingManager.java:210)
  AndroidRuntime:        at android.os.Handler.dispatchMessage(Handler.java:102)
  AndroidRuntime:        at android.os.Looper.loop(Looper.java:135)
  AndroidRuntime:        at android.os.HandlerThread.run(HandlerThread.java:61)
  AndroidRuntime:        at com.android.server.ServiceThread.run(ServiceThread.java:46)
  Process : Sending signal. PID: 824 SIG: 9

Bug: 17389885
Change-Id: Id20d7c0ee35229b14c800fd9e07716239179989c
2014-11-12 13:40:30 -08:00
Dan Albert
b28ff487fb resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
2014-11-12 13:24:42 -08:00
Sandeep Siddhartha
5f02d29550 Merge "Don\'t unload the sound model on stopRecognition" into lmp-mr1-dev
automerge: 850ec91

* commit '850ec91e88c2b0911f8460f909eabf4078b78582':
  Don't unload the sound model on stopRecognition
2014-11-12 21:17:53 +00:00
Jeff Sharkey
d68b87cdd4 Recover apps with malformed certificates.
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle.  The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
2014-11-12 13:16:06 -08:00
Dan Albert
5e6cf24213 Merge "Move frameworks/base over to libc++." 2014-11-12 21:11:49 +00:00
Wale Ogunwale
89b3ecc7b3 resolve merge conflicts of 2755644 to lmp-mr1-ub-dev.
Change-Id: I01920b0dc8185d8efb9431bfad911e4733b43e1d
2014-11-12 12:46:45 -08:00
Sandeep Siddhartha
850ec91e88 Merge "Don't unload the sound model on stopRecognition" into lmp-mr1-dev 2014-11-12 20:12:39 +00:00
Fyodor Kupolov
d01ff6d4c3 Added synchronization to handlePackagesChanged method
Method handlePackagesChanged modifies the policy data without holding the
lock. It also calls methods which expect a lock to be held -
validatePasswordOwnerLocked, syncDeviceCapabilitiesLocked, saveSettingsLocked.

Bug: 18262633
Change-Id: Ia4bdc6edc66bccf8a4288e048171ff20858ae2f6
2014-11-12 11:27:21 -08:00
Dan Albert
ff1d8a6635 Move frameworks/base over to libc++.
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
2014-11-12 11:22:20 -08:00
Nick Kralevich
56dd295b69 am 6e5b14c4: Merge "Drop unused String."
* commit '6e5b14c411f7ebdae610c1074e7d4d2d5d2a9550':
  Drop unused String.
2014-11-12 18:14:23 +00:00
Nick Kralevich
6e5b14c411 Merge "Drop unused String." 2014-11-12 18:05:16 +00:00
Mike Lockwood
ebc3d88380 am 4951482c: Merge "Skip receiver if failed linkToDeath to ILocationListener"
* commit '4951482c4de1780a9103189aa4eff93b2e91c804':
  Skip receiver if failed linkToDeath to ILocationListener
2014-11-12 18:00:09 +00:00
Sandeep Siddhartha
45c00b5877 Don't unload the sound model on stopRecognition
This helps us in majority of the scenarios where the sound model doesn't
change across start/stop calls.

Bug: 17954633
Change-Id: Ibff817bb69bc69d2bb3a2603460fed596688b892
2014-11-12 09:57:27 -08:00
Wale Ogunwale
1dfab89aff Fix build breakage from missing close brace.
Change-Id: Ib0e58844b8b208d255ff8d9409d0e7c53f27378f
2014-11-12 09:46:10 -08:00
Jeff Davidson
bc19c181c8 Enforce VPN control "permission" with an actual permission.
The current implementation uses a whitelist of package names. Use a
system|signature permission instead of rolling our own security and
add that permission to the existing set of whitelisted packages
(SystemUI and VpnDialogs).

In addition to being less of a security risk (using well-known methods
like Context.enforceCallingPermission rather than manually querying
PackageManager and checking UIDs for package names), this enables
other system-privileged apps to control VPN as needed per the below
bug.

Bug: 18327583
Change-Id: I38617965c40d62cf1ac28e3cb382c0877fb1275d
2014-11-12 08:56:20 -08:00
Wale Ogunwale
3ae0d3157d Fixed constant window switching on lock screen with Swype KB.
We allow TYPE_INPUT_METHOD windows to show on the lock screen.
These windows can attached other types of windows (For this
case the Swype KB was attaching a PopupWinow which will be
of TYPE_APPLICATION). This causes the popup window app token
to be added to the list of apps to be hidden on the lock
screen, thereby preventing the lock screen from been hidden,
which then causes a layout cycle(s). Now, we remove app
tokens for non-app windows from the hidden list in case it
was added by any attached widow they migth have.

Also, when we are updating window animations, set the
hideWhenLocked flag for windows that are IME tragets so
they don't go through unneeded cycles of having their
visibility policy set to hide/show/hide/show/...

Bug: 18021493
Change-Id: I3680256d41793f62def42fda00e26db1dcc990cc
2014-11-12 08:42:09 -08:00
Jorim Jaggi
0f51dd679c am bd70ed1d: am a816a075: Merge "Improve lockscreen launch animations" into lmp-mr1-dev
* commit 'bd70ed1de2dda959b15be4f6eb2179c3235b3179':
  Improve lockscreen launch animations
2014-11-12 15:55:56 +00:00
Jorim Jaggi
2240f80634 am d04f864c: am b9eedce2: Merge "Fix lockscreen launch animations once and for all" into lmp-mr1-dev
* commit 'd04f864cae1ae553398774692effb663b73f902c':
  Fix lockscreen launch animations once and for all
2014-11-12 15:55:44 +00:00
Robert Craig
f44e674fbd Drop unused String.
Change-Id: I152447bec37db33f6c4356e2a373b00ff99d7de7
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-11-12 10:43:45 -05:00
Jorim Jaggi
f8d77da969 Improve lockscreen launch animations
- Add a timeout so if WindowManager "forgets" to tell that the
activity has drawn, we still unlock after 3 seconds, so the user
is not completely stuck.

- Use the screen height instead of the window height for the
translation animation.

- Don't run the animation if the attached window is not null. The
animation from the attached window will influence the transformation
as well, so there is no need to run an additional animation in this
case (apps with SurfaceView's had broken unlock transitions because
of this).

- If the starting window needs to go away while the unlock transition
is running, modify the existing animation such that it fades out in
the same transition.

Bug: 15991916
Change-Id: Ia5dfa31e1bc0d5745fe228e1daf08e268733b6f1
2014-11-12 15:02:33 +01:00
Jorim Jaggi
44f60cca7b Fix lockscreen launch animations once and for all
In SysUI, make sure not to dismiss Keyguard multiple times when just
waiting for a deferred dismissal, so WindowManager doesn't get
multiple calls to keyguardGoingAway.

Change heuristics how notifying Keyguard about activity drawn works.
Always notify Keyguard after executing an app transition, and notify
it also when not doing a transition after a startActivity call.

For that to work, update AppWindowToken.startingDisplayed also when
the window is displayed, but force hidden because of Keyguard.

Further, handle the case correctly when a window gets added during
the Keyguard exit animation by overriding the start time for the
animation of that new window. Also don't apply a transition animation
for a window when executing keyguard exit animation, so by removing
a starting window we don't break this animation.

Last but not least, tell Keyguard to start exiting immediately if
animations for exiting are disabled, like when going to phone/camera
on lockscreen. Before, we always had a delay of 1 second because we
waited for the timeout.

Bug: 1599196
Bug: 18272544
Change-Id: I596b2489f814b934abd256e16079d3d3f326e209
2014-11-12 15:02:05 +01:00
Narayan Kamath
d57eefa4dd am c83443b4: am ccfe6bd4: Merge "Remove unused local field." into lmp-mr1-dev
* commit 'c83443b43ab13b4e9797d4ffa47529a0eb01076f':
  Remove unused local field.
2014-11-12 13:38:40 +00:00
Narayan Kamath
ccfe6bd479 Merge "Remove unused local field." into lmp-mr1-dev 2014-11-12 13:30:18 +00:00
Narayan Kamath
3a35bf3f9c am 72f9838c: am 222722ee: Merge "Tell installd when boot completes." into lmp-mr1-dev
* commit '72f9838c99a9cb8d84b8ec4af5372f10eeeb4e94':
  Tell installd when boot completes.
2014-11-12 12:55:29 +00:00
Narayan Kamath
222722ee73 Merge "Tell installd when boot completes." into lmp-mr1-dev 2014-11-12 12:48:22 +00:00
Adrian Roos
6fafa8cdce am 36d059f9: am 138b8334: Obliterate LockPatternUtilsCache
* commit '36d059f9d995c8f52b9e6f0c6b540801ec249990':
  Obliterate LockPatternUtilsCache
2014-11-12 11:37:27 +00:00
Adrian Roos
314661a427 am 2b958379: am fc29e0b5: Properly destroy TrustAgentWrapper when not bound
* commit '2b9583798804c8fadc8272a245d037475a899648':
  Properly destroy TrustAgentWrapper when not bound
2014-11-12 11:37:21 +00:00
Adrian Roos
138b83347b Obliterate LockPatternUtilsCache
It is disabled dead code already and not useful anymore
with the new caching in LockSettingsService.

Bug: 18163444
Change-Id: Icc184e923e0fbeab31ed128336c01f835b24c6f2
2014-11-12 11:31:38 +00:00
Adrian Roos
fc29e0b582 Properly destroy TrustAgentWrapper when not bound
Also fixes a potential issue where refreshing agents
for a user that no longer exists would result in a crash.

Bug: 18318629
Change-Id: I3589ea7e0f2e63fca02daeecf3ca964a8a8e4b3b
2014-11-12 11:30:36 +00:00