Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 710575 - INSTALL_FAILED_CONFLICTING_PROVIDER when installing a custom build r=rnewman

Browse Source 
--HG--
rename : mobile/android/base/db/BrowserProvider.java => mobile/android/base/db/BrowserProvider.java.in
This commit is contained in:
Brad Lassey 2011-12-15 16:18:29 -05:00
parent d1f13f9290
commit a3c57e0b3a
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/android/base/AndroidManifest.xml.in
View File

@ -140,13 +140,13 @@
android:label="@string/preferences_title"
android:excludeFromRecents="true"/>
<provider android:name="org.mozilla.gecko.db.BrowserProvider"
android:authorities="org.mozilla.gecko.providers.browser"
android:permission="org.mozilla.gecko.permissions.BROWSER_PROVIDER"/>
<provider android:name="@ANDROID_PACKAGE_NAME@.db.BrowserProvider"
android:authorities="@ANDROID_PACKAGE_NAME@.db.browser"
android:permission="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"/>
</application>
<permission android:name="org.mozilla.gecko.permissions.BROWSER_PROVIDER"
<permission android:name="@ANDROID_PACKAGE_NAME@.permissions.BROWSER_PROVIDER"
android:protectionLevel="signature"/>
</manifest>

3
mobile/android/base/Makefile.in
View File

@ -58,7 +58,6 @@ JAVAFILES = \
db/BrowserContract.java \
db/AndroidBrowserDB.java \
db/BrowserDB.java \
db/BrowserProvider.java \
db/LocalBrowserDB.java \
DoorHanger.java \
DoorHangerPopup.java \
@ -116,6 +115,7 @@ PROCESSEDJAVAFILES = \
LauncherShortcuts.java \
NotificationHandler.java \
Restarter.java \
db/BrowserProvider.java \
$(NULL)
@ -428,6 +428,7 @@ classes.dex: $(JAVAFILES) $(PROCESSEDJAVAFILES) R.java
$(DX) --dex --output=$@ classes
AndroidManifest.xml $(PROCESSEDJAVAFILES) package-name.txt: % : %.in
mkdir -p db
$(PYTHON) $(topsrcdir)/config/Preprocessor.py \
$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@

10
mobile/android/base/db/BrowserContract.java
View File

@ -54,11 +54,11 @@ public class BrowserContract {
public static final String PARAM_SHOW_DELETED = "show_deleted";
interface CommonColumns {
public interface CommonColumns {
public static final String _ID = "_id";
}
interface SyncColumns {
public interface SyncColumns {
public static final String GUID = "guid";
public static final String DATE_CREATED = "created";
@ -68,13 +68,13 @@ public class BrowserContract {
public static final String IS_DELETED = "deleted";
}
interface URLColumns {
public interface URLColumns {
public static final String URL = "url";
public static final String TITLE = "title";
}
interface ImageColumns {
public interface ImageColumns {
public static final String FAVICON = "favicon";
public static final String THUMBNAIL = "thumbnail";
@ -140,4 +140,4 @@ public class BrowserContract {
public static final String VERSION = "version";
}
}
}

4
mobile/android/base/db/BrowserProvider.java → mobile/android/base/db/BrowserProvider.java.in
View File

@ -36,7 +36,8 @@
*
* ***** END LICENSE BLOCK ***** */
package org.mozilla.gecko.db;
#filter substitution
package @ANDROID_PACKAGE_NAME@.db;
import java.io.File;
import java.util.HashMap;
@ -50,6 +51,7 @@ import org.mozilla.gecko.db.BrowserContract.Images;
import org.mozilla.gecko.db.BrowserContract.Schema;
import org.mozilla.gecko.db.BrowserContract.SyncColumns;
import org.mozilla.gecko.db.BrowserContract.URLColumns;
import org.mozilla.gecko.db.BrowserContract;
import android.content.ContentProvider;
import android.content.ContentUris;