diff options
5 files changed, 226 insertions, 34 deletions
diff --git a/core/java/android/server/search/SearchManagerService.java b/core/java/android/server/search/SearchManagerService.java index db812d1..373e61f 100644 --- a/core/java/android/server/search/SearchManagerService.java +++ b/core/java/android/server/search/SearchManagerService.java @@ -30,6 +30,8 @@ import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; +import android.os.SystemProperties; +import android.text.TextUtils; import android.util.Log; import java.util.List; @@ -59,6 +61,10 @@ public class SearchManagerService extends ISearchManager.Stub final SearchDialog mSearchDialog; ISearchManagerCallback mCallback = null; + private final boolean mDisabledOnBoot; + + private static final String DISABLE_SEARCH_PROPERTY = "dev.disablesearchdialog"; + /** * Initializes the Search Manager service in the provided system context. * Only one instance of this object should be created! @@ -86,6 +92,9 @@ public class SearchManagerService extends ISearchManager.Stub // After startup settles down, preload the searchables list, // which will reduce the delay when the search UI is invoked. mHandler.post(mRunUpdateSearchable); + + // allows disabling of search dialog for stress testing runs + mDisabledOnBoot = !TextUtils.isEmpty(SystemProperties.get(DISABLE_SEARCH_PROPERTY)); } /** @@ -207,6 +216,13 @@ public class SearchManagerService extends ISearchManager.Stub boolean globalSearch, ISearchManagerCallback searchManagerCallback) { if (DBG) debug("performStartSearch()"); + + if (mDisabledOnBoot) { + Log.d(TAG, "ignoring start search request because " + DISABLE_SEARCH_PROPERTY + + " system property is set."); + return; + } + mSearchDialog.show(initialQuery, selectInitialQuery, launchActivity, appSearchData, globalSearch); if (searchManagerCallback != null) { diff --git a/core/java/com/android/internal/backup/LocalTransport.java b/core/java/com/android/internal/backup/LocalTransport.java index 83182f2..f7b89f2 100644 --- a/core/java/com/android/internal/backup/LocalTransport.java +++ b/core/java/com/android/internal/backup/LocalTransport.java @@ -1,6 +1,7 @@ package com.android.internal.backup; import android.backup.BackupDataInput; +import android.backup.BackupDataOutput; import android.backup.RestoreSet; import android.content.Context; import android.content.pm.PackageInfo; @@ -147,7 +148,7 @@ public class LocalTransport extends IBackupTransport.Stub { return packages.toArray(result); } - public int getRestoreData(int token, PackageInfo packageInfo, ParcelFileDescriptor output) + public int getRestoreData(int token, PackageInfo packageInfo, ParcelFileDescriptor outFd) throws android.os.RemoteException { if (DEBUG) Log.v(TAG, "getting restore data " + token + " : " + packageInfo.packageName); // we only support one hardcoded restore set @@ -161,28 +162,21 @@ public class LocalTransport extends IBackupTransport.Stub { File[] blobs = packageDir.listFiles(); int err = 0; if (blobs != null && blobs.length > 0) { - for (File f : blobs) { - err = copyFileToFD(f, output); - if (err != 0) break; + BackupDataOutput out = new BackupDataOutput(mContext, outFd.getFileDescriptor()); + try { + for (File f : blobs) { + FileInputStream in = new FileInputStream(f); + int size = (int) f.length(); + byte[] buf = new byte[size]; + in.read(buf); + out.writeEntityHeader(f.getName(), size); + out.writeEntityData(buf, size); + } + } catch (Exception e) { + Log.e(TAG, "Unable to read backup records"); + err = -1; } } - return err; } - - private int copyFileToFD(File source, ParcelFileDescriptor dest) { - try { - FileInputStream in = new FileInputStream(source); - FileOutputStream out = new FileOutputStream(dest.getFileDescriptor()); - byte[] buffer = new byte[4096]; - int bytesRead; - while ((bytesRead = in.read(buffer)) >= 0) { - out.write(buffer, 0, bytesRead); - } - } catch (IOException e) { - // something went wrong; claim failure - return -1; - } - return 0; - } } diff --git a/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java b/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java deleted file mode 100644 index 010601a..0000000 --- a/tests/permission/src/com/android/framework/permission/tests/DummyPermissionTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.android.framework.permission.tests; - -import junit.framework.TestCase; - -/** - * TODO: Remove this. This is only a placeholder, need to implement this. - */ -public class DummyPermissionTest extends TestCase { - - public void testMe() { - - } -} diff --git a/tests/permission/src/com/android/framework/permission/tests/PmPermissionsTests.java b/tests/permission/src/com/android/framework/permission/tests/PmPermissionsTests.java new file mode 100644 index 0000000..b690c45 --- /dev/null +++ b/tests/permission/src/com/android/framework/permission/tests/PmPermissionsTests.java @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2006 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.framework.permission.tests; + +import junit.framework.TestCase; +import android.content.pm.PackageManager; +import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; + +/** + * Verify PackageManager api's that require specific permissions. + */ +public class PmPermissionsTests extends AndroidTestCase { + private PackageManager mPm; + private String mPkgName = "com.android.framework.permission.tests"; + + @Override + protected void setUp() throws Exception { + super.setUp(); + mPm = getContext().getPackageManager(); + } + + /* + * This test verifies that PackageManger.getPackageSizeInfo enforces permission + * android.permission.GET_PACKAGE_SIZE + */ + @SmallTest + public void testGetPackageSize() { + try { + mPm.getPackageSizeInfo(mPkgName, null); + fail("PackageManager.getPackageSizeInfo" + + "did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } + + /* + * This test verifies that PackageManger.DeleteApplicationCacheFiles enforces permission + * android.permission.DELETE_CACHE_FILES + */ + @SmallTest + public void testDeleteApplicationCacheFiles() { + try { + mPm.deleteApplicationCacheFiles(mPkgName, null); + fail("PackageManager.deleteApplicationCacheFiles" + + "did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } + + /* + * This test verifies that PackageManger.installPackage enforces permission + * android.permission.INSTALL_PACKAGES + */ + @SmallTest + public void testInstallPackage() { + try { + mPm.installPackage(null, null, 0, null); + fail("PackageManager.installPackage" + + "did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } + + /* + * This test verifies that PackageManger.freeStorage + * enforces permission android.permission.CLEAR_APP_CACHE + */ + @SmallTest + public void testFreeStorage1() { + try { + mPm.freeStorage(100000, null); + fail("PackageManager.freeStorage " + + "did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } + + /* + * This test verifies that PackageManger.freeStorageAndNotify + * enforces permission android.permission.CLEAR_APP_CACHE + */ + @SmallTest + public void testFreeStorage2() { + try { + mPm.freeStorageAndNotify(100000, null); + fail("PackageManager.freeStorageAndNotify" + + " did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } + + /* + * This test verifies that PackageManger.clearApplicationUserData + * enforces permission android.permission.CLEAR_APP_USER_DATA + */ + @SmallTest + public void testClearApplicationUserData() { + try { + mPm.clearApplicationUserData(mPkgName, null); + fail("PackageManager.clearApplicationUserData" + + "did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } + + /* + * This test verifies that PackageManger.deletePackage + * enforces permission android.permission.DELETE_PACKAGES + */ + @SmallTest + public void testDeletePackage() { + try { + mPm.deletePackage(mPkgName, null, 0); + fail("PackageManager.deletePackage" + + "did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } +}
\ No newline at end of file diff --git a/tests/permission/src/com/android/framework/permission/tests/SettingsPermissionsTests.java b/tests/permission/src/com/android/framework/permission/tests/SettingsPermissionsTests.java new file mode 100644 index 0000000..f55998f --- /dev/null +++ b/tests/permission/src/com/android/framework/permission/tests/SettingsPermissionsTests.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.framework.permission.tests; + +import android.content.ContentResolver; +import android.content.ContentValues; +import android.provider.Settings; +import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.MediumTest; + +/** + * Verify that accessing private-API protected Settings require specific permissions. + */ +public class SettingsPermissionsTests extends AndroidTestCase { + + private ContentResolver mContentResolver; + + @Override + protected void setUp() throws Exception { + super.setUp(); + mContentResolver = getContext().getContentResolver(); + } + + /** + * Verify that writing to the GServices table in Settings provider requires permissions. + * <p>Tests Permission: + * {@link android.Manifest.permission#WRITE_GSERVICES} + */ + @MediumTest + public void testWriteGServices() { + try { + ContentValues values = new ContentValues(); + values.put("url", "android"); + mContentResolver.insert(Settings.Gservices.CONTENT_URI, values); + fail("Write into Gservices provider did not throw SecurityException as expected."); + } catch (SecurityException e) { + // expected + } + } +}
\ No newline at end of file |