aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removing READ_PHONE_STATE perm since PRIVILEGED_PHONE_STATE is also usedHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0Amit Mahajan2015-07-101-1/+0
* Add weak leanback compatibility to experimental permissions appTodd Volkert2015-06-222-7/+38
* Add a permissions sample using the support libSvetoslav2015-06-035-33/+30
* Fix build of permissions sample appSvetoslav2015-03-281-7/+7
* Polish the demo app a bitSvetoslav2015-03-2615-112/+325
* Permissions sample appSvet Ganov2015-03-2327-233/+1102
* Add an explicit dependency on org.apache.http.legacy.Narayan Kamath2015-02-062-0/+3
* Add resource mismatch violation to strict mode testAlan Viverette2015-01-051-0/+3
* am f3dd9231: am 72836101: am 4e1989ac: Merge "Remove legacy SELinux policy pa...dcashman2014-11-040-0/+0
|\
| * am 72836101: am 4e1989ac: Merge "Remove legacy SELinux policy parser."dcashman2014-11-040-0/+0
| |\
| | * am 4e1989ac: Merge "Remove legacy SELinux policy parser."dcashman2014-11-040-0/+0
| | |\
| | | * Merge "Remove legacy SELinux policy parser."dcashman2014-11-046-15366/+0
| | | |\
| | | | * Remove legacy SELinux policy parser.dcashman2014-11-046-15366/+0
| | | |/
* | | | am e730717f: am 0d967b74: Merge "Script for SELinux CTS avc rules test." auto...dcashman2014-11-030-0/+0
|\| | |
| * | | am e730717f: am 0d967b74: Merge "Script for SELinux CTS avc rules test." auto...dcashman2014-11-030-0/+0
| |\ \ \
| | * \ \ am 0d967b74: Merge "Script for SELinux CTS avc rules test." automerge: 588c7cddcashman2014-11-036-0/+15364
| | |\ \ \
| | | * \ \ Merge "Script for SELinux CTS avc rules test."dcashman2014-11-036-0/+15364
| | | |\ \ \
* | | | | | | am a0396f9b: am 73b58ab9: Merge lmp-dev-plus-aosp-without-vendor into stage-a...Bill Yi2014-10-280-0/+0
|\| | | | | |
| * | | | | | am 73b58ab9: Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-270-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-masterBill Yi2014-10-2227-15375/+908
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | am bd7014db: am daf9c078: Merge "procstatlog: Use %zu for size_t"Elliott Hughes2014-10-070-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | am a78f0116: am ecbf323e: (-s ours) Update the sample print service with adva...Svetoslav2014-10-070-0/+0
| | | |\ \ \ \
| | | * \ \ \ \ am 80ee25d4: am 0f11f776: (-s ours) Update the sample code for printing from ...Svetoslav2014-10-070-0/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am ebbb11d5: am 9fbba1f7: (-s ours) Merge "Update the print sample/test code....Svetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am ee2cf90a: am cb4a6984: (-s ours) merge in klp-release (no-op)Ed Heyl2014-10-070-0/+0
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am 53e24c58: am 3b842d9a: (-s ours) merge in KQS81MEd Heyl2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 1956d790: am bf99aeb2: (-s ours) Update the sample code due to API changeSvetoslav2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ am 07a3bdc8: am d7192328: (-s ours) Updated the sample code due to API changesSvetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ am 77247b4d: am e816e252: (-s ours) Update sample code due to API changeSvetoslav2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am a75e9403: am d4749f7e: (-s ours) Updated the test/sample apps due to new A...Svetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am b61bb3c2: am 5a7f277a: (-s ours) Updated the sample code due to API changes.Svetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 90d8e059: am ccd352be: (-s ours) Update the print sample code.Svetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 121b2030: am 92ee8105: (-s ours) Added test UI to the sample print service.Svetoslav2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 12fe4d54: am e8c204dc: (-s ours) Update the print samples due to API changesSvetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7202bc62: am 4760c411: (-s ours) define a target sdk for the showcase.Chris Wren2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 447f2ff2: am e0139447: (-s ours) make the mock phone call insistentChris Wren2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b48d082f: am dcc3ea28: (-s ours) Merge "Update the samples code"Svetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4efe95a2: am e23fd877: (-s ours) Merge "Adding lazy population of printer ...Svetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c8a1e239: am 5ee00488: (-s ours) Merge "Update samples due for framework c...Svetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 150ab3ed: am d3ef7ac5: (-s ours) Merge "NotificationShowcase improvements"Chris Wren2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 574864a8: am a71b28ab: (-s ours) Update samples due to API changeSvetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ceb75842: am 151acb82: (-s ours) Update the print service sapmle.Svetoslav Ganov2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c0aac4d2: am 11e24e5f: (-s ours) Update sample code due to API changesSvetoslav2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c6239184: am 5eb1dfdd: (-s ours) Print - print servicesSvetoslav2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 54e35e23: am 1e0c48bb: (-s ours) Fix issue #7255954: API Review: rename Dr...Dianne Hackborn2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ee9473d1: am c0c316e9: (-s ours) Sample Dream showing an error message.Daniel Sandler2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fd685338: am b727ba0e: (-s ours) Reconcile with jb-releaseThe Android Open Source Project2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7e1f0c93: am efae2faa: (-s ours) Port notification showcase to android-sup...Chris Wren2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e44f569a: am 4a583e8e: (-s ours) Add an inbox exmaple to the showcase.Chris Wren2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e57af510: am 0544d9a7: (-s ours) Test out the setStyle() flow in the showcaseChris Wren2014-10-070-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \