summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 1944667b: am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for ↵Dmitriy Ivanov2015-03-111-0/+3
|\ | | | | | | | | | | | | libjnigraphics" * commit '1944667b7f70c336da66cc3fbdee3a2fbd766980': Generate sysv hash for libjnigraphics
| * am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"Dmitriy Ivanov2015-03-101-0/+3
| |\ | | | | | | | | | | | | * commit '8ced0357152a9df64c9e21c8f3cec69cc7e8403d': Generate sysv hash for libjnigraphics
| | * am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"Dmitriy Ivanov2015-03-101-0/+3
| | |\ | | | | | | | | | | | | | | | | * commit '2a88ff2fe1849a3823962a2c239afdf6339fedc9': Generate sysv hash for libjnigraphics
| | | * Merge "Generate sysv hash for libjnigraphics"Dmitriy Ivanov2015-03-101-0/+3
| | | |\
| | | | * Generate sysv hash for libjnigraphicsDmitriy Ivanov2015-03-091-0/+3
| | | |/ | | | | | | | | | | | | | | | | Bug: 19059885 Change-Id: I9b227fda6549e15a5ce50ac6b59250dff1371bb3
* | | | Merge "resolved conflicts for merge of b6d6c04a to master"Andreas Gampe2015-03-113-7/+9
|\ \ \ \
| * \ \ \ resolved conflicts for merge of b6d6c04a to masterAndreas Gampe2015-03-103-7/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: I5286b9fe2d9bde4b219496e593cf028cc4c75bc7
| | * | | am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to ↵Andreas Gampe2015-03-103-7/+9
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | installd" * commit '174a44888ec56f688426c80d50b9e0021f47c16f': Frameworks/base: Pass APK debugability to installd
| | | * | am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"Andreas Gampe2015-03-103-7/+9
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit '7f383873566024c7121cadae3bbdd2a7c47150bc': Frameworks/base: Pass APK debugability to installd
| | | | * Merge "Frameworks/base: Pass APK debugability to installd"Andreas Gampe2015-03-093-7/+9
| | | | |\
| | | | | * Frameworks/base: Pass APK debugability to installdAndreas Gampe2015-03-093-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
* | | | | | Merge "Notify TrustAgentService when device policy configuration no longer ↵Adrian Roos2015-03-112-6/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | applies"
| * | | | | | Notify TrustAgentService when device policy configuration no longer appliesAdrian Roos2015-03-092-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updates the outdated javadoc to match the current API. Bug: 19500731 Change-Id: I7976bbcc815b84e168718672377a963ffea68c51
* | | | | | | Merge "Make settings XML files readable"Svetoslav2015-03-101-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Make settings XML files readableSvetoslav2015-03-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I320f5419e045d257dc5ccbf81a9434f9b9d38564
* | | | | | | | Merge "Handle simultaneous connect of devices with the same "type" (as in USB)"Paul McLean2015-03-102-98/+141
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle simultaneous connect of devices with the same "type" (as in USB)Paul McLean2015-03-102-98/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I163bf8e33ccf5aacc7ba21775916727430327f18 Bug: 19563570
* | | | | | | | | Merge "Add Phone.ENTERPRISE_CONTENT_URI"Ricky Wai2015-03-101-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Phone.ENTERPRISE_CONTENT_URIRicky Wai2015-03-041-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19550047 Change-Id: I0c780c27913d2c005be4f1ac033cba9a479a0b4f
* | | | | | | | | | Merge "Track down unsupported texture target"Chris Craik2015-03-103-2/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Track down unsupported texture targetChris Craik2015-03-103-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:19641517 Change-Id: Idc2e413abef5bb1438ffb3f52efb001504d3e89f
* | | | | | | | | | | Merge "Revert "Remove activity and window stacks when last task is removed.""Wale Ogunwale2015-03-103-26/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Revert "Remove activity and window stacks when last task is removed."Wale Ogunwale2015-03-103-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f95e3f0753508344b198c0a76afb892df514f52. Bug: 19644506 Bug: 19083170 Change-Id: I2eb2a0400be58fe2c5d48a4b68368725e98aaf6f
* | | | | | | | | | | Merge "Correct docs to specify leading slash in paths."Craig Mautner2015-03-101-2/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Correct docs to specify leading slash in paths.Craig Mautner2015-03-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The guide documentation for the manifest data element contains a grammar that implies leading slashes are not required for the path part of a URI string. Also the path documentation does not mention the need for a leading slash. Grammar from documentation: <scheme>://<host>:<port>/[<path>|<pathPrefix>|<pathPattern>] ^ | Included "/" -----------+ All internal usages of path, pathPrefix, and pathPattern, have a / starting out the string and these attributes don't work without that /. This change updates the grammar and the documentation for the path attributes. Fixes bug 19540035 Change-Id: I931a25fd1c10c01eaa32a7cfa82cca256b129efb
* | | | | | | | | | | | Merge "Add several CallSupers to View"Chris Craik2015-03-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add several CallSupers to ViewChris Craik2015-03-101-0/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3011bd9757273f9c1d35f552bd6fefd4bf830029
* | | | | | | | | | | | Merge "ZenLog: Track changes to effect suppressorship."John Spurlock2015-03-102-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ZenLog: Track changes to effect suppressorship.John Spurlock2015-03-092-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19656287 Change-Id: Ibbb42bef68f4588beac4ca971db73a19678c2b4c
* | | | | | | | | | | | Remove unused settings constants from the SDK (framework).Svetoslav2015-03-105-36/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The settings constants for various volumes do nothing and are used by nothing since API version 2. These are however backed up in the cloud which is a waste of resource. This change removes these constants from the SDK while keeping them hidden to avoid breaking released apps and also prevents unnecessary backup. Change-Id: I2e91863115f5a4b997a14f8d0f57b4dc9689cfab
* | | | | | | | | | | | Merge "Move more file handling into LockSettingsStorage"Robin Lee2015-03-101-4/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move more file handling into LockSettingsStorageRobin Lee2015-03-101-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strengthens the guarantee of only one kind of lock type existing at one time by clearing all of the relevant files out closer to time of write. Change-Id: I141103dab5d7d4bc80b05a22b8566326d1c9e7e1
* | | | | | | | | | | | | am 4c887ac9: am db7fa51f: am c7446790: Merge "ZygoteConnection: remove ↵dcashman2015-03-101-148/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obsolete security checks." * commit '4c887ac9318402b914dbee4462485006395bdfbe': ZygoteConnection: remove obsolete security checks.
| * | | | | | | | | | | | am db7fa51f: am c7446790: Merge "ZygoteConnection: remove obsolete security ↵dcashman2015-03-091-148/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checks." * commit 'db7fa51ff0f330b79b171f03b4304a75affaabce': ZygoteConnection: remove obsolete security checks.
| | * | | | | | | | | | | am c7446790: Merge "ZygoteConnection: remove obsolete security checks."dcashman2015-03-091-148/+22
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c74467902b5a9a7267b6cb8f30b364b8373eac72': ZygoteConnection: remove obsolete security checks.
| | | * | | | | | | | | | Merge "ZygoteConnection: remove obsolete security checks."dcashman2015-03-091-148/+22
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | ZygoteConnection: remove obsolete security checks.dcashman2015-03-091-148/+22
| | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SELinux guarantees that only the system_server and permissive domains such as su are allowed to connect to the zygote socket. Remove obsolete security checks that were only applicable when other processes could connect. Bug: 19624279 Change-Id: I1c925d7facf19b3953b5deb85d992415344c4c9f
* | | | | | | | | | | | | am 502c30da: am 5427ac71: am 282099b5: am 5a604b35: am 00e3efb5: am ↵Rich Slogar2015-03-101-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs * commit '502c30da55d0bb6f2a51875558612fc50361c55f': docs: android plugin for gradle release 1.1.3 release notes
| * | | | | | | | | | | | am 5427ac71: am 282099b5: am 5a604b35: am 00e3efb5: am f51020ea: am ↵Rich Slogar2015-03-091-1/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs * commit '5427ac7147416f63ab55d45ab9b975fdbb7a195e': docs: android plugin for gradle release 1.1.3 release notes
| | * \ \ \ \ \ \ \ \ \ \ \ am 282099b5: am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge ↵Rich Slogar2015-03-091-1/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs * commit '282099b57f23814a95128e37bdb5a5a1971ede67': docs: android plugin for gradle release 1.1.3 release notes
| | | * \ \ \ \ \ \ \ \ \ \ \ am 5a604b35: am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android ↵Rich Slogar2015-03-091-1/+30
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugin for gradle release 1.1.3 release notes" into lmp-docs * commit '5a604b359cd487d4a01a397e49117d22848e6809': docs: android plugin for gradle release 1.1.3 release notes
| | | | * \ \ \ \ \ \ \ \ \ \ \ am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for ↵Rich Slogar2015-03-091-1/+30
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gradle release 1.1.3 release notes" into lmp-docs * commit '00e3efb549274ac381c95e359611ce7dcc9542cc': docs: android plugin for gradle release 1.1.3 release notes
| | | | | * \ \ \ \ \ \ \ \ \ \ \ am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release ↵Rich Slogar2015-03-091-1/+30
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.1.3 release notes" into lmp-docs * commit 'f51020eaaaff9f54cee1ba91ab35d0212ddb0f54': docs: android plugin for gradle release 1.1.3 release notes
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release ↵Rich Slogar2015-03-091-1/+30
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes" into lmp-docs * commit '6e1cbe43957b18f471f82682b5df999578230230': docs: android plugin for gradle release 1.1.3 release notes
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "docs: android plugin for gradle release 1.1.3 release notes" into ↵Rich Slogar2015-03-091-1/+30
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs
| | | | | | | | * | | | | | | | | | | | docs: android plugin for gradle release 1.1.3 release notesRich Slogar2015-03-061-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
* | | | | | | | | | | | | | | | | | | | Merge "Add support for the new native Builder class on StaticLayout."Diego Perez2015-03-101-2/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add support for the new native Builder class on StaticLayout.Diego Perez2015-03-101-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates StaticLayout_Delegate to support the new Builder class introduced in ag/646289. Change-Id: I9f8c528b8751ce69482e33ac6f1bc42406a0b606
* | | | | | | | | | | | | | | | | | | | | Merge "MediaSession: Notify PlaybackInfo callbacks when playback type changes."John Spurlock2015-03-101-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | MediaSession: Notify PlaybackInfo callbacks when playback type changes.John Spurlock2015-03-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19665979 Change-Id: I506a71330ca04a678027f5969638fd1685326b2d
generated by cgit v1.1 at 2025-01-23 05:22:18 +0000