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

15016 Commits

Author SHA1 Message Date
Adrian Roos
93891686eb Merge "Remove leftover code causing trust agent issues" 2015-03-09 16:06:43 +00:00
Geoff Mendal
8951e572de Merge "Import translations. DO NOT MERGE" 2015-03-09 13:55:21 +00:00
Geoff Mendal
cfad35db63 Import translations. DO NOT MERGE 
Change-Id: I433509f59a78920d4e2ac1e5eb4d44fb81b2fd48
Auto-generated-cl: translation import
 2015-03-09 06:40:26 -07:00
Geoff Mendal
cb93de1b7d Import translations. DO NOT MERGE 
Change-Id: Id2e79810aa3f2c1beb932786f579feab06b6825a
Auto-generated-cl: translation import
 2015-03-09 06:23:28 -07:00
Dan Sandler
1c20d3cf3f am eef3fbcf: am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit 'eef3fbcf6825a5e5e0cb150123d9bc87956fbb23':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:39:10 +00:00
Dan Sandler
eef3fbcf68 am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit '8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:31:04 +00:00
Dan Sandler
8deb6d95a7 am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit 'e6a4b445944489d67d40c8f52322fb149290fcf8':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:21:47 +00:00
Dan Sandler
e6a4b44594 am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 
* commit '3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
  Avoid crashing on startup when policy forbids lockscreen camera.
 2015-03-06 00:10:22 +00:00
Dan Sandler
3581f4c91a Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev 2015-03-06 00:03:37 +00:00
Adrian Roos
a4da9f6b99 Remove leftover code causing trust agent issues 
When trust agent whitelists were added in MR1,
the isTrustDisabled method was left in although
it prevents the whitelist from working properly.

Bug: 19461292
Change-Id: I72eb041b03e1f16c582cbf2a0bb622a70444caeb
 2015-03-05 19:27:37 +00:00
John Spurlock
3bedeb0101 am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE. 
* commit 'bd438742870a51eacea3554376f671bd1be0e30c':
  MediaProjectionPermissionActivity: Fix NPE.
 2015-03-04 23:15:51 +00:00
John Spurlock
bd43874287 am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE. 
* commit 'b879e7395fa9446952b840b1d576ff225b039774':
  MediaProjectionPermissionActivity: Fix NPE.
 2015-03-04 23:09:19 +00:00
John Spurlock
b879e7395f am c974ac11: MediaProjectionPermissionActivity: Fix NPE. 
* commit 'c974ac11f808968648d26e83a0b64a7fba02ad15':
  MediaProjectionPermissionActivity: Fix NPE.
 2015-03-04 23:01:26 +00:00
John Spurlock
75328b703f Merge "Audio: Remove the concept of master volume." 2015-03-04 22:59:41 +00:00
John Spurlock
ee5ad729b9 Audio: Remove the concept of master volume. 
- Remove two config resources (use master volume, and volume ramp).
- Remove master volume adjustments / getters / intents.
- Retain @hidden setMasterMute, needed for device admin
- Remove master volume logic in AudioService.
- Remove master volume logic in VolumePanel.
- Rename "getMasterStreamType" to "getUiSoundsStreamType" to avoid confusion.

Bug: 19582978
Change-Id: Id02c8fa4898cff3b913147f5ac1b4038e2e7cc24
 2015-03-04 17:51:44 -05:00
John Spurlock
c974ac11f8 MediaProjectionPermissionActivity: Fix NPE. 
Avoid dismissing a null dialog.

Bug: 19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
 2015-03-04 18:58:18 +00:00
Andrei Kapishnikov
d5fe9f60b3 Merge "Replace absolute_uri with absolute_path when HTTP request is forwarded to non-proxy server." 2015-03-04 14:56:31 +00:00
Geoff Mendal
a4f2c41ebf Import translations. DO NOT MERGE 
Change-Id: I7b7b245ade1c83878576c5e9e489a4506bfd7538
Auto-generated-cl: translation import
 2015-03-04 06:50:38 -08:00
Geoff Mendal
3b9e64f326 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-04 14:04:04 +00:00
Geoff Mendal
c70510298e Import translations. DO NOT MERGE 
Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7
Auto-generated-cl: translation import
 2015-03-04 06:02:36 -08:00
Geoff Mendal
63069cc985 Import translations. DO NOT MERGE 
Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426
Auto-generated-cl: translation import
 2015-03-04 05:56:33 -08:00
Geoff Mendal
42796e97f6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-04 13:41:22 +00:00
Geoff Mendal
302132c379 Import translations. DO NOT MERGE 
Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693
Auto-generated-cl: translation import
 2015-03-04 05:35:11 -08:00
Geoff Mendal
cba2873edc Import translations. DO NOT MERGE 
Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b
Auto-generated-cl: translation import
 2015-03-04 05:29:01 -08:00
Jim Miller
25d7e51a10 Change fingerprint behavior in keyguard to dismiss on notification 
This changes fingerprint to dismiss the notification screen rather
than moving to a trusted state.

Fixes bug 19592835

Change-Id: I5020408df2e8b73a34c264b5ac052251e3a17b8d
 2015-03-03 17:12:09 -08:00
Dan Sandler
e163a645dd Avoid crashing on startup when policy forbids lockscreen camera. 
Bug: 19554426
Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
 2015-03-03 16:06:28 -05:00
Chris Wren
70205fc199 Merge "add null guards around notification listener handlers" 2015-03-03 20:08:08 +00:00
Chris Craik
4939e2bf36 Merge "Improve docs for drawable tint and color filters" 2015-03-03 16:46:48 +00:00
Paul Jensen
44f72397be Correct "Sign-in" and "Sign into" to "Sign in to". 
bug:19416574
Change-Id: I55cedd2a3e1c1c3192ece860f37c82a55cb6d7c0
 2015-03-03 15:46:36 +00:00
Chris Craik
bd3bfc5285 Improve docs for drawable tint and color filters 
bug:19564477
Change-Id: I7e11baae2d4dd245965904c85b8855de71f6b6ac
 2015-03-02 16:21:02 -08:00
John Spurlock
7b91c55b3f Merge "Remove unused imports in frameworks/base." 2015-03-02 20:43:50 +00:00
Winson Chung
0e1f9b91f1 Merge "Force single stack id workaround. (Bug 19560619)" 2015-03-02 18:24:09 +00:00
Winson Chung
955ac2237d Force single stack id workaround. (Bug 19560619) 
Change-Id: Ia3cbe0ca75b018bf499a814f37d8a532d52981f1
 2015-03-02 10:20:37 -08:00
Jason Monk
be3c5dbee6 Make QS use SettingsLib's BT code 
A couple of changes needed to be made to SettingsLib to support this.
 - SettingsLib needed to track ACTION_CONNECTION_STATE_CHANGED
 - The summary code needed to move from Settings up into SettingsLib
 - Added a getMaxConnectionState to CachedBluetoothDevice
    - This simplifies the states of all of the profiles into
      one.

Change-Id: I7f828f0038ad0cf39274986ece6d486d545f0286
 2015-03-02 10:40:21 -05:00
Geoff Mendal
5ac82a5117 Merge "Import translations. DO NOT MERGE" 2015-03-02 15:37:30 +00:00
Geoff Mendal
b409d300d1 Import translations. DO NOT MERGE 
Change-Id: I54de8a6c8accba25846ccea871e096df4bbee52c
Auto-generated-cl: translation import
 2015-03-02 07:01:31 -08:00
Geoff Mendal
3c89ff2289 Import translations. DO NOT MERGE 
Change-Id: I209860801eccbb182374ecb6abe8ddc0a0bca700
Auto-generated-cl: translation import
 2015-03-02 06:44:30 -08:00
Geoff Mendal
fe78077418 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-02 14:18:15 +00:00
Geoff Mendal
341b04711d Import translations. DO NOT MERGE 
Change-Id: Icff770a9eb701279c5011e816970c69c58862174
Auto-generated-cl: translation import
 2015-03-02 06:15:22 -08:00
Geoff Mendal
6b5b052ee6 Import translations. DO NOT MERGE 
Change-Id: I7b517cbc545481e58ddc8afc769fc5f39d4fd1ad
Auto-generated-cl: translation import
 2015-03-02 06:09:28 -08:00
Geoff Mendal
4d065f9d62 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-02 13:52:07 +00:00
Geoff Mendal
20f4004368 Import translations. DO NOT MERGE 
Change-Id: I276c74627637383b8e9e132dcb41b597e7db1d54
Auto-generated-cl: translation import
 2015-03-02 05:48:19 -08:00
Geoff Mendal
c92894e61a Import translations. DO NOT MERGE 
Change-Id: I90f0e65ebcc2b70c492f9c1f726436f47c582a5d
Auto-generated-cl: translation import
 2015-03-02 05:42:09 -08:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
Jim Miller
ba67aee02c Add fingerprint settings support to the framework 
- cleanup thread issue and simplify native FingerprintService methods
- add new permissions and enforce them
- add fingerprint hardware detection API

Change-Id: I87c2243ea2412061f1e85b044138480d0161bcdf
 2015-02-27 12:03:32 -08:00
Jason Monk
bd61b2a1fd am 58ae213c: am 0ac63669: am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '58ae213c3df42d9aa7501071a03460ff69ba44e2':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:47:27 +00:00
Jason Monk
58ae213c3d am 0ac63669: am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '0ac63669b1a3da456fde5c8df61b652eb090a407':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:31:35 +00:00
Jason Monk
0ac63669b1 am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '057fd382cc26ff85db397835fdd3b7e5c73ef336':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:18:53 +00:00
Jason Monk
057fd382cc am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '9df42df2bca0a7a91d813b19e084069675d4057b':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 21:59:06 +00:00
John Spurlock
af5d44e441 Merge "VolumePrototypes: Better handle removals/upgrades." 2015-02-26 20:54:14 +00:00