drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
233,691 Commits 1 Branch 0 Tags
Commit Graph

233691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andres Morales
f1af917c14 Merge "Add SystemApi for retrieving device flash lock state" into nyc-dev 2016-02-24 17:30:26 +00:00
Jean-Michel Trivi
16ad43c000 Merge "Audio record notification: report client/device configuration" into nyc-dev 2016-02-24 17:08:34 +00:00
Jeff Sharkey
6bda33f6a0 Merge "Don't try caching null ringtones." into nyc-dev 2016-02-24 16:55:37 +00:00
Jeff Sharkey
97f061bb7c Don't try caching null ringtones. 
Bug: 27330629
Change-Id: Id09d10d6f4a3a20782480647c68a5c94ef69e7b3
 2016-02-24 09:54:16 -07:00
Steve McKay
dbdca5b299 Merge "Fix error formatting for copy/move/delete failures." into nyc-dev 2016-02-24 16:24:29 +00:00
Jason Monk
6a723f73bd Merge "Add constant to link to app's general settings" into nyc-dev 2016-02-24 16:23:03 +00:00
Jorim Jaggi
7aea4f49de Only prolong animations for freeform 
So we don't unnecessarily slow down the regular transition

Change-Id: I84e4bf0f9a7caf59dd20478166458f2642e98c80
 2016-02-24 16:13:34 +00:00
Geoff Mendal
d2626cd94f Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-24 15:37:36 +00:00
Geoff Mendal
29c973df93 Import translations. DO NOT MERGE 
Change-Id: I5cf7b687227eab1006fd0fe7b8bd09bb8e1740e2
Auto-generated-cl: translation import
 2016-02-24 07:32:23 -08:00
Jason Monk
2f68e8a62a Add constant to link to app's general settings 
Bug: 27276982
Change-Id: Ia438faeb12b24251bb74919f680713a7bc03e0b5
 2016-02-24 10:25:42 -05:00
Geoff Mendal
8baf238a41 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-24 15:23:14 +00:00
Geoff Mendal
d2ed77384f Import translations. DO NOT MERGE 
Change-Id: I33919dcf9c769c9aeb603e6c9d022fc1aeba10ca
Auto-generated-cl: translation import
 2016-02-24 07:22:14 -08:00
Jason Monk
a4fe238905 Merge "Support changes in Settings for battery graph" into nyc-dev 2016-02-24 14:21:20 +00:00
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
d49095d1e4 Fix error formatting for copy/move/delete failures. 
This caused major failures in the job operations, including
failing tests.

Change-Id: I697f1481df39a156f7ebfde08b31af6b23380f17
 2016-02-24 19:23:54 +09: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
Jean-Michel Trivi
33fd8169cd Audio record notification: report client/device configuration 
Report client and device recording configuration during updates.
Support querying the AudioFormat in AudioRecordConfiguration.

Bug 22876530

Change-Id: I90b44db9bc3fda479452fc63221f8082f5b6a741
 2016-02-23 16:40:03 -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