Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

f8c07d68

Commit f8c07d68 authored 9 years ago by Russell Brenner Committed by Android (Google) Code Review 9 years ago

Downloads
- Plain Diff

Merge "Add new permission for am.updateLockTaskPackages()" into nyc-dev

parents 3ccb3542 b3ad5676

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

core/res/AndroidManifest.xml 5 additions, 0 deletions

core/res/AndroidManifest.xml
services/core/java/com/android/server/am/ActivityManagerService.java 2 additions, 1 deletion

...re/java/com/android/server/am/ActivityManagerService.java

with 7 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment