Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
234,516 Commits 3 Branches 0 Tags
c656d5edba4e346d3fd6cf605ee31d4a35e1fb0a
Commit Graph

234516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
c656d5edba Merge "Support changes in Settings for battery graph" into nyc-dev 
am: a4fe238905

* commit 'a4fe2389058dea713aff32a54b5754c4999b6402':
  Support changes in Settings for battery graph
 2016-02-24 14:25:44 +00: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
ed778a3805 Merge "Fix QS battery details not updating" into nyc-dev 
am: 84ce06132f

* commit '84ce06132f31ef2fbe0c8745e5f2d00712488a6f':
  Fix QS battery details not updating
 2016-02-24 14:21:04 +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
f1c1fea8ed Merge "Throw UnsupportedOperationException when creating ephemeral user on a system without split system user." into nyc-dev 
am: 515a6c7030

* commit '515a6c7030f73aeb812b13e7073e814dcd35c297':
  Throw UnsupportedOperationException when creating ephemeral user on a system without split system user.
 2016-02-24 13:52:43 +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
592de57043 Import translations. DO NOT MERGE 
am: e68b90c7d3  -s ours

* commit 'e68b90c7d3620fe33b4205948abb78ba9e4f8011':
  Import translations. DO NOT MERGE
 2016-02-24 13:43:04 +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
12879173ad Merge "Call webview updating logic with the system UID when setup done." into nyc-dev 
am: 55ea20d9e2

* commit '55ea20d9e22dec44b17352c4c9c17b49830ca40f':
  Call webview updating logic with the system UID when setup done.
 2016-02-24 12:58:38 +00: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
e8a4797e00 Merge "Prevent ephemeral user from being re-entered after stop." into nyc-dev 
am: cfdc99ef5e

* commit 'cfdc99ef5e542f61cd405132fc140b14d9ec1620':
  Prevent ephemeral user from being re-entered after stop.
 2016-02-24 12:38:00 +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
9e801372ae Merge "Removing lock contention in SecurityLogMonitor" into nyc-dev 
am: 07d9bb821b

* commit '07d9bb821be27b126712f9919a77e71e5fa9117c':
  Removing lock contention in SecurityLogMonitor
 2016-02-24 12:16:36 +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
4fd156d24d Merge "Fix FontFamily nAddFontWeightStyle in nyc" into nyc-dev 
am: f19e782233

* commit 'f19e782233c4135097f12e7f770ba041718078d7':
  Fix FontFamily nAddFontWeightStyle in nyc
 2016-02-24 11:52:04 +00:00
Diego Perez
f19e782233 Merge "Fix FontFamily nAddFontWeightStyle in nyc" into nyc-dev 2016-02-24 11:50:23 +00:00
Tony Mak
f9ff698198 Merge "Should call clearCallingIdentity before accessing getProfileParent" into nyc-dev 
am: 8882ce5c2d

* commit '8882ce5c2da1f06f2c153296ec132e7128a07d1a':
  Should call clearCallingIdentity before accessing getProfileParent
 2016-02-24 11:39:13 +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
576e4b8120 Merge "Clarify javadoc for SecurityLog" into nyc-dev 
am: 61ea6d0bbf

* commit '61ea6d0bbfeb88eef5096fa985f819d51f32db82':
  Clarify javadoc for SecurityLog
 2016-02-24 10:35:32 +00:00
Rubin Xu
61ea6d0bbf Merge "Clarify javadoc for SecurityLog" into nyc-dev 2016-02-24 10:31:36 +00:00
Tomasz Mikolajewski
48fc1d60ac Merge "Wire removeDocument() to Jobs." into nyc-dev 
am: 1bf6ed9fb8

* commit '1bf6ed9fb88fb604b300abf82494ad58df390984':
  Wire removeDocument() to Jobs.
 2016-02-24 08:45:15 +00:00
Tomasz Mikolajewski
1bf6ed9fb8 Merge "Wire removeDocument() to Jobs." into nyc-dev 2016-02-24 08:42:16 +00:00
Lorenzo Colitti
86b5635540 resolve merge conflicts of 51e4acb29d to nyc-dev 
am: 1142b2654a

* commit '1142b2654ae36b54a61bfe759f2f43a01532ae93':
  Add Connectivity Metrics Logger service
 2016-02-24 06:37:35 +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
25f1652a80 Merge "Adapted the lockscreen style" into nyc-dev 
am: 6831e8ea76

* commit '6831e8ea7601c506b1e8c61021fecfffa9cb183e':
  Adapted the lockscreen style
 2016-02-24 04:09:49 +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
6008bb5488 Merge "Update accessibility to be encryption-aware." into nyc-dev 
am: 1082306709

* commit '10823067099642c7f6bf186d3c83960ac9f67c5a':
  Update accessibility to be encryption-aware.
 2016-02-24 03:22:40 +00: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
632dfe783b Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev 
am: b4caa028c2

* commit 'b4caa028c2a4469a8488ba946e9e201aaded3f7e':
  TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER
 2016-02-24 02:19:34 +00: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
Zhijun He
3384da1332 Merge "ImageReader: override the flexible YUV compatible formats" am: 90804668a8 
am: 38e8a7f89f

* commit '38e8a7f89f1461c596a7eecce7355e750e8a9b07':
  ImageReader: override the flexible YUV compatible formats
 2016-02-24 02:03:48 +00:00
Zhijun He
38e8a7f89f Merge "ImageReader: override the flexible YUV compatible formats" 
am: 90804668a8

* commit '90804668a8a3fcbc661a6fba32737d1468194941':
  ImageReader: override the flexible YUV compatible formats
 2016-02-24 01:56:43 +00: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
d1b91d467f Merge "ImageReader: override the flexible YUV compatible formats" into nyc-dev 
am: c7a1b095a8

* commit 'c7a1b095a8f380b29f3f5108dd3e72f4898176b1':
  ImageReader: override the flexible YUV compatible formats
 2016-02-24 01:50:57 +00:00
Zhijun He
90804668a8 Merge "ImageReader: override the flexible YUV compatible formats" 2016-02-24 01:46:12 +00: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
8a217eba48 Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev 
am: aa83d163aa

* commit 'aa83d163aa93b8a4f267e8fc434a3916f540d561':
  Make FingerprintManager#hasEnrolledFingerprints per-user
 2016-02-24 01:36:27 +00:00
Clara Bayarri
aa83d163aa Merge "Make FingerprintManager#hasEnrolledFingerprints per-user" into nyc-dev 2016-02-24 01:31:02 +00:00
Pavlin Radoslavov
1b82a4e575 Merge "resolve merge conflicts of 95330efa55 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp 2016-02-24 01:09:19 +00:00
Pavlin Radoslavov
3dff8e5a76 resolve merge conflicts of 95330efa55 to nyc-dev-plus-aosp 
Change-Id: Id756847f0788a9a8ae20d58bd6be54f76c96fee3
 2016-02-23 17:07:10 -08:00
Fyodor Kupolov
0bf96d30e7 Merge "Disable switching users until user 0 is unlocked" into nyc-dev 
am: 598255ae02

* commit '598255ae02752f06acf86db30f4e0f5655d2ea96':
  Disable switching users until user 0 is unlocked
 2016-02-24 01:01:10 +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