diff options
| author | Karthikeyan Periasamy <kperiasa@codeaurora.org> | 2016-04-17 00:41:58 +0200 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2016-04-17 00:41:58 +0200 |
| commit | 18fa00a82628ef35e3d69c4bcde968f23c75e3b4 (patch) | |
| tree | 57bd8217b553a28f3c493328096ffd2182f0643b /src | |
| parent | 879f4f91f390db5a5cf58f6a94ee360cc182d113 (diff) | |
| download | android_packages_apps_Gello-18fa00a82628ef35e3d69c4bcde968f23c75e3b4.tar.gz android_packages_apps_Gello-18fa00a82628ef35e3d69c4bcde968f23c75e3b4.tar.bz2 android_packages_apps_Gello-18fa00a82628ef35e3d69c4bcde968f23c75e3b4.zip | |
Adding package name as an authority
External content URI's to the browser use system browser's package name
(com.android.browser) as the authority.
Added package name as one of the authorities for acceptable URI's in
BrowserProvider
Change-Id: I2d6db2faf43f94cb64f89f6a1189a08f4b184cef
CR-Fixed: 967778
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/platformsupport/BrowserContract.java | 3 | ||||
| -rw-r--r-- | src/com/android/browser/provider/BrowserProvider2.java | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/src/com/android/browser/platformsupport/BrowserContract.java b/src/com/android/browser/platformsupport/BrowserContract.java index 79bdfb87..54fe988e 100644 --- a/src/com/android/browser/platformsupport/BrowserContract.java +++ b/src/com/android/browser/platformsupport/BrowserContract.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * Not a contribution. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -47,6 +47,7 @@ import com.android.browser.BrowserConfig; public class BrowserContract { /** The authority for the browser provider */ public static final String AUTHORITY = BrowserConfig.AUTHORITY; + public static final String APP_PACKAGE_NAME = BrowserConfig.APP_PACKAGE_NAME; /** A content:// style uri to the authority for the browser provider */ public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY); diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index 53f567f8..6a3fc8f8 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -232,6 +232,34 @@ public class BrowserProvider2 extends SQLiteContentProvider { matcher.addURI(authority, "omnibox_suggestions", OMNIBOX_SUGGESTIONS); matcher.addURI(authority, "homepage", HOMEPAGE); + final String app_package_name = BrowserContract.APP_PACKAGE_NAME; + matcher.addURI(app_package_name, "accounts", ACCOUNTS); + matcher.addURI(app_package_name, "bookmarks", BOOKMARKS); + matcher.addURI(app_package_name, "bookmarks/#", BOOKMARKS_ID); + matcher.addURI(app_package_name, "bookmarks/folder", BOOKMARKS_FOLDER); + matcher.addURI(app_package_name, "bookmarks/folder/#", BOOKMARKS_FOLDER_ID); + matcher.addURI(app_package_name, "bookmarks/folder/id", BOOKMARKS_DEFAULT_FOLDER_ID); + matcher.addURI(app_package_name, + SearchManager.SUGGEST_URI_PATH_QUERY, + BOOKMARKS_SUGGESTIONS); + matcher.addURI(app_package_name, + "bookmarks/" + SearchManager.SUGGEST_URI_PATH_QUERY, + BOOKMARKS_SUGGESTIONS); + matcher.addURI(app_package_name, "history", HISTORY); + matcher.addURI(app_package_name, "history/#", HISTORY_ID); + matcher.addURI(app_package_name, "searches", SEARCHES); + matcher.addURI(app_package_name, "searches/#", SEARCHES_ID); + matcher.addURI(app_package_name, "syncstate", SYNCSTATE); + matcher.addURI(app_package_name, "syncstate/#", SYNCSTATE_ID); + matcher.addURI(app_package_name, "images", IMAGES); + matcher.addURI(app_package_name, "combined", COMBINED); + matcher.addURI(app_package_name, "combined/#", COMBINED_ID); + matcher.addURI(app_package_name, "settings", SETTINGS); + matcher.addURI(app_package_name, "thumbnails", THUMBNAILS); + matcher.addURI(app_package_name, "thumbnails/#", THUMBNAILS_ID); + matcher.addURI(app_package_name, "omnibox_suggestions", OMNIBOX_SUGGESTIONS); + matcher.addURI(app_package_name, "homepage", HOMEPAGE); + // Legacy matcher.addURI(LEGACY_AUTHORITY, "searches", SEARCHES); matcher.addURI(LEGACY_AUTHORITY, "searches/#", SEARCHES_ID); |