233674 Commits

Author SHA1 Message Date
Jason Monk
84ce06132f Merge "Fix QS battery details not updating" into nyc-dev 2016-02-24 14:17:07 +00:00
Lenka Trochtova
515a6c7030 Merge "Throw UnsupportedOperationException when creating ephemeral user on a system without split system user." into nyc-dev 2016-02-24 13:50:17 +00:00
Geoff Mendal
e68b90c7d3 Import translations. DO NOT MERGE
Change-Id: I71f7d4c86befd1e8aecfe397792b63c1cf74aa29
Auto-generated-cl: translation import
2016-02-24 08:25:31 -05:00
Gustav Sennton
55ea20d9e2 Merge "Call webview updating logic with the system UID when setup done." into nyc-dev 2016-02-24 12:56:10 +00:00
Lenka Trochtova
cfdc99ef5e Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev 2016-02-24 12:34:58 +00:00
Michal Karpinski
07d9bb821b Merge "Removing lock contention in SecurityLogMonitor" into nyc-dev 2016-02-24 12:12:26 +00:00
Michal Karpinski
a0ea967d11 Removing lock contention in SecurityLogMonitor
After being interrupted the monitor thread tried to acquire
a lock that is held by interrupting thread, resulting in timeouting
on join().

Bug: 27061904
Change-Id: Ifbd578d5f5a266083b207fedd8ebb6d26ab08c31
2016-02-24 12:04:17 +00:00
Diego Perez
f19e782233 Merge "Fix FontFamily nAddFontWeightStyle in nyc" into nyc-dev 2016-02-24 11:50:23 +00:00
Tony Mak
8882ce5c2d Merge "Should call clearCallingIdentity before accessing getProfileParent" into nyc-dev 2016-02-24 11:36:41 +00:00
Tony Mak
134364556e Should call clearCallingIdentity before accessing getProfileParent
Bug: 27308833
Change-Id: Ib33fcc0f30dada5f307f45c7c85dce5fb5e4a064
2016-02-24 11:08:38 +00:00
Gustav Sennton
275d13c2c6 Call webview updating logic with the system UID when setup done.
After performing the webview setup we check whether we changed webview
implementation during the setup and, if so, we rerun the updating-logic.
This logic needs special permissions such as changing settings
(Settings.Global) which the shared relro process doesn't have,
therefore, when the shared relro process notifies us that the setup is
done we need to switch to using the system uid when running the
update-logic.

Bug: 27262336
Change-Id: I68646884e31ba55c860ff98c3f30a520beb0ef95
2016-02-24 10:58:09 +00:00
Lenka Trochtova
1ddda4793c Prevent ephemeral user from being re-entered after stop.
Once the ephemeral user stops, the user's deletion is scheduled.
It takes a while before the user actually disappears and it is not
desirable for the user to be re-entered in the meantime.
Mark the user as disabled on stop and check this flag
in the activity manager to prevent the user from being switched
to again. Also hide the user from user-switching UI.

BUG: 26795729
BUG: 26780152

Change-Id: I83a61674958954b5a210114b88ffa5ae55922c1f
2016-02-24 11:55:58 +01:00
Rubin Xu
61ea6d0bbf Merge "Clarify javadoc for SecurityLog" into nyc-dev 2016-02-24 10:31:36 +00:00
Tomasz Mikolajewski
1bf6ed9fb8 Merge "Wire removeDocument() to Jobs." into nyc-dev 2016-02-24 08:42:16 +00:00
Lorenzo Colitti
1142b2654a resolve merge conflicts of 51e4acb29d to nyc-dev
Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.

Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31
2016-02-24 15:19:15 +09:00
Pierre Imai
51e4acb29d Merge "Add Connectivity Metrics Logger service" into mm-wireless-dev 2016-02-24 04:49:24 +00:00
Selim Cinek
6831e8ea76 Merge "Adapted the lockscreen style" into nyc-dev 2016-02-24 03:59:46 +00:00
Tomasz Mikolajewski
db87543d82 Wire removeDocument() to Jobs.
Bug: 27303034
Change-Id: I6388e2b70b523670210cd8285800b4c187c8f8b8
2016-02-24 12:32:57 +09:00
Jeff Sharkey
1082306709 Merge "Update accessibility to be encryption-aware." into nyc-dev 2016-02-24 03:17:11 +00:00
Jeff Sharkey
e88e266547 Update accessibility to be encryption-aware.
Look for both EA and non-EA accessibility services, but when the user
is locked only bind to EA services.  Once the user is unlocked, we
take another pass and bind to any non-EA services.

We only consider disabling accessibility once the user is unlocked,
since there could be non-EA services waiting in the wings.

Bug: 25860579
Change-Id: I97bd019661457c3577d629ba12290d02f026011a
2016-02-23 20:15:15 -07:00
Dongwon Kang
b4caa028c2 Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev 2016-02-24 02:09:03 +00:00
Dongwon Kang
a60bc111e5 TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER
Bug: 21778419
Change-Id: I1684e2f1c274306706736061e3f41c9840e563c4
2016-02-23 18:03:55 -08:00
Selim Cinek
f1015dbe97 Adapted the lockscreen style
It's that time of the release again.

Bug: 24866646
Change-Id: Iebfae2f2cc6b5a21b7b98df359de2247b2bc8632
2016-02-23 17:56:22 -08:00
Zhijun He
c7a1b095a8 Merge "ImageReader: override the flexible YUV compatible formats" into nyc-dev 2016-02-24 01:45:30 +00:00
Clara Bayarri
aa83d163aa Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev 2016-02-24 01:31:02 +00:00
Fyodor Kupolov
598255ae02 Merge "Disable switching users until user 0 is unlocked" into nyc-dev 2016-02-24 00:51:11 +00:00
Clara Bayarri
33fd3cf2d9 Make FingerprintManager#hasEnrolledFingerprints per-user
Needed by Settings to determine if the work profile has fingerprints

Bug: 27263452
Change-Id: Ic54f59461b44a525284f6a1ab3d17627c652f842
2016-02-23 16:49:58 -08:00
Jorim Jaggi
ffd049027f Fix wrong measurement in DecorView
Bug: 27215338
Change-Id: I512df9b23788daf485b020a2199a55a7c6ab6311
2016-02-24 00:31:23 +00:00
Jae Seo
eefb17ac61 Merge "TIF: Unhide URI util methods" into nyc-dev 2016-02-23 23:39:10 +00:00
Tyler Gunn
e40cc28452 Merge "Add new ConnectionEvent API (hide) to send a notification to Telecom" into nyc-dev 2016-02-23 23:38:59 +00:00
Chris Craik
388e43f419 Merge "Fix drawColor/drawPaint bounds" into nyc-dev 2016-02-23 23:33:53 +00:00
Jae Seo
87079f1fd8 TIF: Unhide URI util methods
Bug: 27314735
Change-Id: Ib2aeb451a435bb959efb1cba359c335b051f88e5
2016-02-23 15:22:33 -08:00
Fyodor Kupolov
a3eccfb842 Merge "Copy shared accounts after the user is unlocked" into nyc-dev 2016-02-23 23:05:39 +00:00
Shishir Agrawal
fcbc1645b5 Merge "DO NOT MERGE: Add subscription specific TelephonyManager calls." into mm-wireless-dev
am: 29c490bcd3  -s ours

* commit '29c490bcd31cda210e1730649ba4fef02d74c69d':
  DO NOT MERGE: Add subscription specific TelephonyManager calls.
2016-02-23 23:04:25 +00:00
Shishir Agrawal
29c490bcd3 Merge "DO NOT MERGE: Add subscription specific TelephonyManager calls." into mm-wireless-dev 2016-02-23 22:59:23 +00:00
Doris Liu
3005843506 Merge "Support running AVD on UI thread" into nyc-dev 2016-02-23 22:43:53 +00:00
Doris Liu
28cfd20f02 Support running AVD on UI thread
By default, AVD animates on RT thread. But since in some cases there's a
need for a finer control on when the frame update for the animation should
happen, such as coordiating the AVD animation with other animations that
run on UI thread, we are providing a way to force the AVD to run on UI
thread.

Bug: 27278616
Change-Id: I372ecd3dc52e3fa0bdce3a1e9c19443f9b199027
2016-02-23 14:40:47 -08:00
Liejun Tao
f7e98b2c44 DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am: 9ef7634fa9 am: d46bd91531
am: 2fb16b066b  -s ours

* commit '2fb16b066b3e4e22ee489f31f75170ebc052f0ec':
  DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
2016-02-23 22:14:24 +00:00
Anthony Chen
c78f0a7a9c Merge "Scale phone state icons." into nyc-dev 2016-02-23 22:11:17 +00:00
Liejun Tao
2fb16b066b DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case am: 9ef7634fa9
am: d46bd91531

* commit 'd46bd9153144f905138e0b609c3d8252a5d5505e':
  DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
2016-02-23 22:00:37 +00:00
Liejun Tao
d46bd91531 DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
am: 9ef7634fa9

* commit '9ef7634fa9b4e9cf9ea9380aee8b7dfd71f24b57':
  DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case
2016-02-23 21:54:00 +00:00
Bo Hu
4dc580c0df Merge "Emulator: Replace ro.kernel.qemu.gles with qemu.gles" into nyc-dev 2016-02-23 21:46:33 +00:00
Pankaj Kanwar
934b91db10 Merge changes from topic \'notification\' into mm-wireless-dev
am: 2339b786c7

* commit '2339b786c77fb75f2f123f592195579da20554ca':
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821
2016-02-23 21:40:52 +00:00
Mihai Niță
86ee2c0235 Merge "Removed warning icons and use friendlier locale names" into nyc-dev 2016-02-23 21:37:05 +00:00
Pankaj Kanwar
2339b786c7 Merge changes from topic 'notification' into mm-wireless-dev
* changes:
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821
2016-02-23 21:32:15 +00:00
Joe Onorato
e1acd636d4 Make getBatteryUptimeLocked protected so it can be mocked.
Also fix test names.

Change-Id: I43477e61c22cd36735214951c45c52b39095e1b5
2016-02-23 13:28:03 -08:00
Mihai Nita
502141d50b Removed warning icons and use friendlier locale names
* Removed warning icons in locale list (b/26710677)
* Use getDisplayNameWithDialect() instead of getDisplayName()
  for the locale names (b/27066642)
* Set proper locale for the language labels (b/27130516)
* Fixed build warning in LocaleHelper (b/27148053)

Bug: 26710677
Bug: 27066642
Bug: 27130516
Bug: 27148053
Change-Id: I149a3675262b286c8b740d2ad5b02f4df31316ec
2016-02-23 13:24:27 -08:00
Joe Onorato
62b9ff4994 Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev
* changes:
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
2016-02-23 21:06:23 +00:00
Jeff Sharkey
1ce5c28ba5 Merge "Offer to cache ringtones in system DE storage." into nyc-dev 2016-02-23 20:57:46 +00:00
Wale Ogunwale
96912d035c Merge "Clear calling identity on Session.startingMovingTask" into nyc-dev 2016-02-23 20:50:50 +00:00