summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Notify TrustAgentService when device policy configuration no longer ap...Adrian Roos2015-03-111-6/+8
|\
| * Notify TrustAgentService when device policy configuration no longer appliesAdrian Roos2015-03-091-6/+8
* | Merge "Add Phone.ENTERPRISE_CONTENT_URI"Ricky Wai2015-03-101-0/+23
|\ \
| * | Add Phone.ENTERPRISE_CONTENT_URIRicky Wai2015-03-041-0/+23
* | | Merge "Add several CallSupers to View"Chris Craik2015-03-101-0/+6
|\ \ \
| * | | Add several CallSupers to ViewChris Craik2015-03-101-0/+6
* | | | Remove unused settings constants from the SDK (framework).Svetoslav2015-03-101-18/+19
* | | | Merge "Cache photo URI too in calllog (contract)"Makoto Onuki2015-03-101-0/+8
|\ \ \ \
| * | | | Cache photo URI too in calllog (contract)Makoto Onuki2015-03-091-0/+8
* | | | | Merge "Handle undo in TextView fields with no cursor"James Cook2015-03-101-2/+3
|\ \ \ \ \
| * | | | | Handle undo in TextView fields with no cursorJames Cook2015-03-101-2/+3
* | | | | | Merge "Revert RelativeLayout's baseline view to API 22 and below behavior"Alan Viverette2015-03-101-15/+31
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert RelativeLayout's baseline view to API 22 and below behaviorAlan Viverette2015-03-091-15/+31
| | |/ / / | |/| | |
* | | | | Merge "Rename and simplify DisplayList Canvas classes"Chris Craik2015-03-106-81/+48
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rename and simplify DisplayList Canvas classesChris Craik2015-03-096-81/+48
* | | | | Merge "Document behavior change of isUninstallBlocked() since L MR1"Rubin Xu2015-03-101-1/+6
|\ \ \ \ \
| * | | | | Document behavior change of isUninstallBlocked() since L MR1Rubin Xu2015-03-101-1/+6
* | | | | | Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth control...Adam Lesinski2015-03-101-4/+74
|\ \ \ \ \ \
| * | | | | | BatteryStats: Record energy info stats from WiFi and Bluetooth controllersAdam Lesinski2015-03-091-4/+74
* | | | | | | Merge "Fix: Drag handles are not shown for selection/insertion"Roozbeh Pournader2015-03-101-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix: Drag handles are not shown for selection/insertionKeisuke Kuroyanagi2015-02-271-0/+2
* | | | | | | | Merge "Camera2: Add hidden depth stream configuration tags"Eino-Ville Talvala2015-03-091-0/+77
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera2: Add hidden depth stream configuration tagsEino-Ville Talvala2015-03-091-0/+77
* | | | | | | | | Merge "Camera2: Remove unused parameters in ICameraDeviceUser#createStream"Eino-Ville Talvala2015-03-093-5/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Camera2: Remove unused parameters in ICameraDeviceUser#createStreamEino-Ville Talvala2015-03-093-5/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "Make TypedArray and LayoutInflater exceptions more useful"Alan Viverette2015-03-092-11/+25
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Make TypedArray and LayoutInflater exceptions more usefulAlan Viverette2015-03-092-11/+25
| |/ / / / / /
* | | | | | | Change WiFi and Bluetooth ActivityEnergyInfo classesAdam Lesinski2015-03-091-9/+12
| |_|_|/ / / |/| | | | |
* | | | | | Merge "Battery stats issues: fix jiffy handling, print scan counts."Dianne Hackborn2015-03-091-21/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Battery stats issues: fix jiffy handling, print scan counts.Dianne Hackborn2015-03-091-21/+20
* | | | | | Merge "Revert "Remove TrustAgent whitelisting API""Adrian Roos2015-03-091-2/+0
|\ \ \ \ \ \
| * | | | | | Revert "Remove TrustAgent whitelisting API"Adrian Roos2015-03-051-2/+0
* | | | | | | Merge "Add a new extra to specify the admin component for provisioning."Nicolas Prevot2015-03-091-2/+39
|\ \ \ \ \ \ \
| * | | | | | | Add a new extra to specify the admin component for provisioning.Nicolas Prevot2015-03-091-2/+39
* | | | | | | | Block setting wallpapers from managed profiles.Benjamin Franz2015-03-094-16/+79
* | | | | | | | Annotate methods with size and range annotationsTor Norbye2015-03-072-6/+10
* | | | | | | | Annotate return values with @CheckReturnTor Norbye2015-03-072-0/+12
* | | | | | | | Annotate methods to be called from overrides with @CallSuperTor Norbye2015-03-078-0/+45
* | | | | | | | am 3f74f638: am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unneces...Andreas Gampe2015-03-081-4/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 55966006: am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern ...Andreas Gampe2015-03-081-4/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"Andreas Gampe2015-03-071-4/+1
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "Frameworks/base: Remove unnecessary Pattern instance"Andreas Gampe2015-03-071-4/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Frameworks/base: Remove unnecessary Pattern instanceAndreas Gampe2015-03-071-4/+1
* | | | | | | | | | | | am 208e80d9: am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unneces...Andreas Gampe2015-03-081-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern ...Andreas Gampe2015-03-081-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"Andreas Gampe2015-03-071-3/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Frameworks/base: Remove unnecessary Pattern instanceAndreas Gampe2015-03-071-3/+1
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "Add more @Nullable annotations"Scott Kennedy2015-03-072-5/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add more @Nullable annotationsScott Kennedy2015-03-062-5/+9
* | | | | | | | | | | Merge "Add new debug feature to automatically create heap dumps."Dianne Hackborn2015-03-075-3/+133
|\ \ \ \ \ \ \ \ \ \ \