Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Define permission for system apps to query size of block" into lmp-mr1-dev

Browse Source
This commit is contained in:
Andres Morales
2014-11-25 17:35:19 +00:00
committed by Android (Google) Code Review
parent 84be180e97 6b0c7acd7f
commit 59093d925d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/AndroidManifest.xml
View File

@@ -1130,6 +1130,12 @@
android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
android:protectionLevel="signature" /> android:protectionLevel="signature" />
<!-- @hide Allows querying state of PersistentDataBlock
<p>Not for use by third-party applications. -->
<permission android:name="android.permission.ACCESS_PDB_STATE"
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
android:protectionLevel="signature" />
<!-- =========================================== --> <!-- =========================================== -->
<!-- Permissions associated with audio capture --> <!-- Permissions associated with audio capture -->

3
services/core/java/com/android/server/PersistentDataBlockService.java
View File

@@ -433,7 +433,10 @@ public class PersistentDataBlockService extends SystemService {
@Override @Override
public int getDataBlockSize() { public int getDataBlockSize() {
if (mContext.checkCallingPermission(Manifest.permission.ACCESS_PDB_STATE)
!= PackageManager.PERMISSION_GRANTED) {
enforceUid(Binder.getCallingUid()); enforceUid(Binder.getCallingUid());
}
DataInputStream inputStream; DataInputStream inputStream;
try { try {