summaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Collapse)AuthorAgeFilesLines
* Fix XML parsing crash in SettingsProviderRaph Levien2015-03-111-1/+1
| | | | | | | | | A previous change added more whitespace to settings_global.xml to improve human readability, but the parser is overly picky in ignoring whitespace. This patch makes it accept all whitespace strings. Bug: 19696812 Change-Id: I3ebb8f6df2e25f4e6b6841da743be3f3a91e2442
* Make settings XML files readableSvetoslav2015-03-101-1/+2
| | | | Change-Id: I320f5419e045d257dc5ccbf81a9434f9b9d38564
* Merge "Rename and simplify DisplayList Canvas classes"Chris Craik2015-03-101-1/+1
|\
| * Rename and simplify DisplayList Canvas classesChris Craik2015-03-091-1/+1
| | | | | | | | Change-Id: I49fd2ce02e01401209fe2a378e9f9547c7b27c61
* | Merge "Add prototype of Inline Reply behind debug flag"Adrian Roos2015-03-095-1/+351
|\ \ | |/ |/|
| * Add prototype of Inline Reply behind debug flagAdrian Roos2015-03-095-1/+351
| | | | | | | | | | | | | | | | The flag also extracts wear-only RemoteInput actions to the normal set of actions under certain circumstances to make this prototype actually useful. Change-Id: Ide8bbef4e2ab82e2f152d32b143876ed309a8f21
* | Merge "Remove leftover code causing trust agent issues"Adrian Roos2015-03-091-18/+5
|\ \
| * | Remove leftover code causing trust agent issuesAdrian Roos2015-03-051-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-092-8/+8
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-03-092-8/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I433509f59a78920d4e2ac1e5eb4d44fb81b2fd48 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-091-1/+1
|/ / / | | | | | | | | | | | | Change-Id: Id2e79810aa3f2c1beb932786f579feab06b6825a Auto-generated-cl: translation import
* | | am eef3fbcf: am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on ↵Dan Sandler2015-03-062-1/+15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | startup when policy forbids lockscreen camera." into lmp-mr1-dev * commit 'eef3fbcf6825a5e5e0cb150123d9bc87956fbb23': Avoid crashing on startup when policy forbids lockscreen camera.
| * | am 8deb6d95: am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when ↵Dan Sandler2015-03-062-1/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | policy forbids lockscreen camera." into lmp-mr1-dev * commit '8deb6d95a73d5d6860fbfb2eb273cdbc49c5d2c9': Avoid crashing on startup when policy forbids lockscreen camera.
| | * \ am e6a4b445: am 3581f4c9: Merge "Avoid crashing on startup when policy ↵Dan Sandler2015-03-062-1/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forbids lockscreen camera." into lmp-mr1-dev * commit 'e6a4b445944489d67d40c8f52322fb149290fcf8': Avoid crashing on startup when policy forbids lockscreen camera.
| | | * \ am 3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen ↵Dan Sandler2015-03-062-1/+15
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | camera." into lmp-mr1-dev * commit '3581f4c91a77ecb9313f51a2d07ed88ff61d9299': Avoid crashing on startup when policy forbids lockscreen camera.
| | | | * \ Merge "Avoid crashing on startup when policy forbids lockscreen camera." ↵Dan Sandler2015-03-062-1/+15
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| | | | | * | Avoid crashing on startup when policy forbids lockscreen camera.Dan Sandler2015-03-032-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19554426 Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
| * | | | | | am bd438742: am b879e739: am c974ac11: MediaProjectionPermissionActivity: ↵John Spurlock2015-03-041-2/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NPE. * commit 'bd438742870a51eacea3554376f671bd1be0e30c': MediaProjectionPermissionActivity: Fix NPE.
| | * | | | | am b879e739: am c974ac11: MediaProjectionPermissionActivity: Fix NPE.John Spurlock2015-03-041-2/+6
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b879e7395fa9446952b840b1d576ff225b039774': MediaProjectionPermissionActivity: Fix NPE.
| | | * | | | am c974ac11: MediaProjectionPermissionActivity: Fix NPE.John Spurlock2015-03-041-2/+6
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit 'c974ac11f808968648d26e83a0b64a7fba02ad15': MediaProjectionPermissionActivity: Fix NPE.
| | | | * | | MediaProjectionPermissionActivity: Fix NPE.John Spurlock2015-03-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid dismissing a null dialog. Bug: 19492919 Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf (cherry picked from commit 3d332f4e67a484abe597576bf329d89655afe720)
| | | * | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-devGeoff Mendal2015-03-041-2/+2
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50787822a2df02ff61bfe4f7402b96dcd2cd43a7 Auto-generated-cl: translation import
| | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-041-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2c19af2e0b45fec9a0486eedbe51d7fe8bdf426 Auto-generated-cl: translation import
| | | * | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-devGeoff Mendal2015-03-021-2/+2
| | | |\ \ \ \
| | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icff770a9eb701279c5011e816970c69c58862174 Auto-generated-cl: translation import
| | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-021-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b517cbc545481e58ddc8afc769fc5f39d4fd1ad Auto-generated-cl: translation import
| | * | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-03-041-2/+2
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb9b4ef49d9e590dc0e37eb3f91b5ae6ad0ba693 Auto-generated-cl: translation import
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-041-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I253641b732a51a58cbabaa6b487e37f5eda69e2b Auto-generated-cl: translation import
| | * | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-03-021-2/+2
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I276c74627637383b8e9e132dcb41b597e7db1d54 Auto-generated-cl: translation import
| | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-021-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90f0e65ebcc2b70c492f9c1f726436f47c582a5d Auto-generated-cl: translation import
* | | | | | | Merge "Audio: Remove the concept of master volume."John Spurlock2015-03-043-73/+12
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Audio: Remove the concept of master volume.John Spurlock2015-03-043-73/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | Merge "Replace absolute_uri with absolute_path when HTTP request is ↵Andrei Kapishnikov2015-03-041-33/+169
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | forwarded to non-proxy server."
| * | | | | | | Replace absolute_uri with absolute_path when HTTP request is forwarded to ↵Andrei Kapishnikov2015-02-111-33/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-proxy server. According to the spec (http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html): When Request-URI is used to identify a resource on an origin server or gateway, the absolute path of the URI MUST be transmitted as the Request-URI. Before the change,the proxy sent absolute_uri, which is used to send HTTP requests to proxies: “The absoluteURI form is REQUIRED when the request is being made to a proxy.” Related Bug 18776631 Other changes: 1. Remove proxy-connection header when the request is sent to an origin server. 2. Added “connection = close” header to indicate that the origin server needs to close the connection right after the response. Currently, our proxy does not support keep-alive (persistent) connections because it analyses only the first request for a given connection and; therefore, cannot perform required request content substitutions. 3. Fixed an issue when a non-numeric host port number resulted in forwarding requests to default 443 port for SSL connections, e.g. request to https://google.com:ZZZ, would be translated to https://google.com:443. 4. Fixed an issue when the proxy tries to establish direct connection to the origin server even when it is not supposed to do that according to PAC. That happened when PAC returned a proxy server that is not available. 5. Prevent ProxyServer from crashing when PacService throws an exception by intercepting all exception types. Change-Id: I7d50b13b4cb24199a690a53c1925e87c15a8d45b
* | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-048-47/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b7b245ade1c83878576c5e9e489a4506bfd7538 Auto-generated-cl: translation import
* | | | | | | | Change fingerprint behavior in keyguard to dismiss on notificationJim Miller2015-03-032-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes fingerprint to dismiss the notification screen rather than moving to a trusted state. Fixes bug 19592835 Change-Id: I5020408df2e8b73a34c264b5ac052251e3a17b8d
* | | | | | | | Merge "add null guards around notification listener handlers"Chris Wren2015-03-031-34/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | add null guards around notification listener handlersChris Wren2015-02-251-34/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17909556 Change-Id: I990489a3839c49f87e3b69b3cb7bdd055fe5aec1
* | | | | | | | | Merge "Improve docs for drawable tint and color filters"Chris Craik2015-03-037-9/+9
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Improve docs for drawable tint and color filtersChris Craik2015-03-027-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:19564477 Change-Id: I7e11baae2d4dd245965904c85b8855de71f6b6ac
* | | | | | | | | Merge "Remove unused imports in frameworks/base."John Spurlock2015-03-0256-109/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused imports in frameworks/base.John Spurlock2015-02-2856-109/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* | | | | | | | | Merge "Force single stack id workaround. (Bug 19560619)"Winson Chung2015-03-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Force single stack id workaround. (Bug 19560619)Winson Chung2015-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3cbe0ca75b018bf499a814f37d8a532d52981f1
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-0272-2/+594
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-0272-2/+594
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54de8a6c8accba25846ccea871e096df4bbee52c Auto-generated-cl: translation import
* | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-03-021-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I209860801eccbb182374ecb6abe8ddc0a0bca700 Auto-generated-cl: translation import