am 907a95c2: am fb5869e9: Merge "Add a class to encapsulate getting the metadata URI"

* commit '907a95c2f1f24b73736118ada0900228ad356734':
  Add a class to encapsulate getting the metadata URI
main
Jean Chalard 2013-04-17 19:41:16 -07:00 committed by Android Git Automerger
commit 9129081070
2 changed files with 29 additions and 1 deletions

View File

@ -422,7 +422,7 @@ public final class BinaryDictionaryFileDumper {
private static void reinitializeClientRecordInDictionaryContentProvider(final Context context, private static void reinitializeClientRecordInDictionaryContentProvider(final Context context,
final ContentProviderClient client, final String clientId) throws RemoteException { final ContentProviderClient client, final String clientId) throws RemoteException {
final String metadataFileUri = context.getString(R.string.dictionary_pack_metadata_uri); final String metadataFileUri = MetadataFileUriGetter.getMetadataUri(context);
if (TextUtils.isEmpty(metadataFileUri)) return; if (TextUtils.isEmpty(metadataFileUri)) return;
// Tell the content provider to reset all information about this client id // Tell the content provider to reset all information about this client id
final Uri metadataContentUri = getProviderUriBuilder(clientId) final Uri metadataContentUri = getProviderUriBuilder(clientId)

View File

@ -0,0 +1,28 @@
/*
* Copyright (C) 2013 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.inputmethod.latin;
import android.content.Context;
/**
* Helper class to get the metadata URI.
*/
public class MetadataFileUriGetter {
public static String getMetadataUri(Context context) {
return context.getString(R.string.dictionary_pack_metadata_uri);
}
}