diff options
27 files changed, 529 insertions, 330 deletions
diff --git a/cmds/keystore/keystore_get.h b/cmds/keystore/keystore_get.h index a7fd9a5..7665e81 100644 --- a/cmds/keystore/keystore_get.h +++ b/cmds/keystore/keystore_get.h @@ -29,7 +29,7 @@ * is returned. Otherwise it returns the value in dynamically allocated memory * and sets the size if the pointer is not NULL. One can release the memory by * calling free(). */ -static char *keystore_get(char *key, int *size) +static char *keystore_get(const char *key, int *size) { char buffer[MAX_KEY_VALUE_LENGTH]; char *value; diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index ec7714d..ba6cc32 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -1068,6 +1068,23 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM unregisterActivityWatcher(watcher); return true; } + + case START_ACTIVITY_IN_PACKAGE_TRANSACTION: + { + data.enforceInterface(IActivityManager.descriptor); + int uid = data.readInt(); + Intent intent = Intent.CREATOR.createFromParcel(data); + String resolvedType = data.readString(); + IBinder resultTo = data.readStrongBinder(); + String resultWho = data.readString(); + int requestCode = data.readInt(); + boolean onlyIfNeeded = data.readInt() != 0; + int result = startActivityInPackage(uid, intent, resolvedType, + resultTo, resultWho, requestCode, onlyIfNeeded); + reply.writeNoException(); + reply.writeInt(result); + return true; + } } return super.onTransact(code, data, reply, flags); @@ -2330,5 +2347,27 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); } + public int startActivityInPackage(int uid, + Intent intent, String resolvedType, IBinder resultTo, + String resultWho, int requestCode, boolean onlyIfNeeded) + throws RemoteException { + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + data.writeInterfaceToken(IActivityManager.descriptor); + data.writeInt(uid); + intent.writeToParcel(data, 0); + data.writeString(resolvedType); + data.writeStrongBinder(resultTo); + data.writeString(resultWho); + data.writeInt(requestCode); + data.writeInt(onlyIfNeeded ? 1 : 0); + mRemote.transact(START_ACTIVITY_IN_PACKAGE_TRANSACTION, data, reply, 0); + reply.readException(); + int result = reply.readInt(); + reply.recycle(); + data.recycle(); + return result; + } + private IBinder mRemote; } diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index ee1b69b..95b376c 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -262,6 +262,11 @@ public interface IActivityManager extends IInterface { public void unregisterActivityWatcher(IActivityWatcher watcher) throws RemoteException; + public int startActivityInPackage(int uid, + Intent intent, String resolvedType, IBinder resultTo, + String resultWho, int requestCode, boolean onlyIfNeeded) + throws RemoteException; + /* * Private non-Binder interfaces */ @@ -415,4 +420,5 @@ public interface IActivityManager extends IInterface { int UNBIND_BACKUP_AGENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+91; int REGISTER_ACTIVITY_WATCHER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+92; int UNREGISTER_ACTIVITY_WATCHER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+93; + int START_ACTIVITY_IN_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+94; } diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index e70b570..bfd9923 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -28,7 +28,6 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.res.Configuration; import android.content.res.Resources; import android.database.Cursor; import android.graphics.drawable.Animatable; @@ -322,16 +321,14 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS if (!globalSearch && mSearchable == null) { globalSearch = true; mSearchable = searchManager.getSearchableInfo(componentName, globalSearch); - - // If we still get back null (i.e., there's not even a searchable info available - // for global search), then really give up. - if (mSearchable == null) { - // Unfortunately, we can't log here. it would be logspam every time the user - // clicks the "search" key on a non-search app. - return false; - } } - + + // If there's not even a searchable info available for global search, then really give up. + if (mSearchable == null) { + Log.w(LOG_TAG, "No global search provider."); + return false; + } + mLaunchComponent = componentName; mAppSearchData = appSearchData; // Using globalSearch here is just an optimization, just calling @@ -702,7 +699,10 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if (DBG) Log.d(LOG_TAG, "onKeyDown(" + keyCode + "," + event + ")"); - + if (mSearchable == null) { + return false; + } + // handle back key to go back to previous searchable, etc. if (handleBackKey(keyCode, event)) { return true; @@ -738,6 +738,9 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS if (DBG_LOG_TIMING) { dbgLogTiming("onTextChanged()"); } + if (mSearchable == null) { + return; + } updateWidgetState(); if (!mSearchAutoComplete.isPerformingCompletion()) { // The user changed the query, remember it. @@ -1563,6 +1566,9 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS */ @Override public boolean onKeyPreIme(int keyCode, KeyEvent event) { + if (mSearchDialog.mSearchable == null) { + return false; + } if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) { if (mSearchDialog.backToPreviousComponent()) { return true; diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java index 58e66b6..f2325d0 100644 --- a/core/java/android/app/SuggestionsAdapter.java +++ b/core/java/android/app/SuggestionsAdapter.java @@ -23,25 +23,24 @@ import android.content.Context; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.res.ColorStateList; import android.content.res.Resources; import android.database.Cursor; -import android.graphics.Canvas; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; +import android.graphics.drawable.StateListDrawable; import android.net.Uri; import android.os.Bundle; import android.server.search.SearchableInfo; import android.text.Html; import android.text.TextUtils; -import android.util.DisplayMetrics; import android.util.Log; -import android.util.TypedValue; +import android.util.SparseArray; import android.view.View; import android.view.ViewGroup; -import android.widget.AbsListView; import android.widget.ImageView; import android.widget.ResourceCursorAdapter; import android.widget.TextView; +import android.widget.Filter; import java.io.FileNotFoundException; import java.io.IOException; @@ -63,6 +62,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter { private SearchableInfo mSearchable; private Context mProviderContext; private WeakHashMap<String, Drawable> mOutsideDrawablesCache; + private SparseArray<Drawable> mBackgroundsCache; private boolean mGlobalSearchMode; // Cached column indexes, updated when the cursor changes. @@ -91,6 +91,12 @@ class SuggestionsAdapter extends ResourceCursorAdapter { private final Runnable mStartSpinnerRunnable; private final Runnable mStopSpinnerRunnable; + /** + * The amount of time we delay in the filter when the user presses the delete key. + * @see Filter#setDelayer(android.widget.Filter.Delayer). + */ + private static final long DELETE_KEY_POST_DELAY = 500L; + public SuggestionsAdapter(Context context, SearchDialog searchDialog, SearchableInfo searchable, WeakHashMap<String, Drawable> outsideDrawablesCache, boolean globalSearchMode) { super(context, @@ -106,6 +112,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter { mProviderContext = mSearchable.getProviderContext(mContext, activityContext); mOutsideDrawablesCache = outsideDrawablesCache; + mBackgroundsCache = new SparseArray<Drawable>(); mGlobalSearchMode = globalSearchMode; mStartSpinnerRunnable = new Runnable() { @@ -119,6 +126,18 @@ class SuggestionsAdapter extends ResourceCursorAdapter { mSearchDialog.setWorking(false); } }; + + // delay 500ms when deleting + getFilter().setDelayer(new Filter.Delayer() { + + private int mPreviousLength = 0; + + public long getPostingDelay(CharSequence constraint) { + long delay = constraint.length() < mPreviousLength ? DELETE_KEY_POST_DELAY : 0; + mPreviousLength = constraint.length(); + return delay; + } + }); } /** @@ -256,7 +275,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter { */ @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { - View v = new SuggestionItemView(context, cursor); + View v = super.newView(context, cursor, parent); v.setTag(new ChildViewCache(v)); return v; } @@ -301,18 +320,13 @@ class SuggestionsAdapter extends ResourceCursorAdapter { if (mBackgroundColorCol != -1) { backgroundColor = cursor.getInt(mBackgroundColorCol); } - ((SuggestionItemView)view).setColor(backgroundColor); + Drawable background = getItemBackground(backgroundColor); + view.setBackgroundDrawable(background); final boolean isHtml = mFormatCol > 0 && "html".equals(cursor.getString(mFormatCol)); - String text1 = null; - if (mText1Col >= 0) { - text1 = cursor.getString(mText1Col); - } - String text2 = null; - if (mText2Col >= 0) { - text2 = cursor.getString(mText2Col); - } - ((SuggestionItemView)view).setTextStrings(text1, text2, isHtml, mProviderContext); + setViewText(cursor, views.mText1, mText1Col, isHtml); + setViewText(cursor, views.mText2, mText2Col, isHtml); + if (views.mIcon1 != null) { setViewDrawable(views.mIcon1, getIcon1(cursor)); } @@ -321,6 +335,66 @@ class SuggestionsAdapter extends ResourceCursorAdapter { } } + /** + * Gets a drawable with no color when selected or pressed, and the given color when + * neither selected nor pressed. + * + * @return A drawable, or {@code null} if the given color is transparent. + */ + private Drawable getItemBackground(int backgroundColor) { + if (backgroundColor == 0) { + return null; + } else { + Drawable cachedBg = mBackgroundsCache.get(backgroundColor); + if (cachedBg != null) { + if (DBG) Log.d(LOG_TAG, "Background cache hit for color " + backgroundColor); + // copy the drawable so that they don't share states + return cachedBg.getConstantState().newDrawable(); + } + if (DBG) Log.d(LOG_TAG, "Creating new background for color " + backgroundColor); + ColorDrawable transparent = new ColorDrawable(0); + ColorDrawable background = new ColorDrawable(backgroundColor); + StateListDrawable newBg = new StateListDrawable(); + newBg.addState(new int[]{android.R.attr.state_selected}, transparent); + newBg.addState(new int[]{android.R.attr.state_pressed}, transparent); + newBg.addState(new int[]{}, background); + mBackgroundsCache.put(backgroundColor, newBg); + return newBg; + } + } + + private void setViewText(Cursor cursor, TextView v, int textCol, boolean isHtml) { + if (v == null) { + return; + } + CharSequence text = null; + if (textCol >= 0) { + String str = cursor.getString(textCol); + if (isHtml && looksLikeHtml(str)) { + text = Html.fromHtml(str); + } else { + text = str; + } + } + // Set the text even if it's null, since we need to clear any previous text. + v.setText(text); + + if (TextUtils.isEmpty(text)) { + v.setVisibility(View.GONE); + } else { + v.setVisibility(View.VISIBLE); + } + } + + private static boolean looksLikeHtml(String str) { + if (TextUtils.isEmpty(str)) return false; + for (int i = str.length() - 1; i >= 0; i--) { + char c = str.charAt(i); + if (c == '<' || c == '&') return true; + } + return false; + } + private Drawable getIcon1(Cursor cursor) { if (mIconName1Col < 0) { return null; @@ -594,179 +668,4 @@ class SuggestionsAdapter extends ResourceCursorAdapter { return cursor.getString(col); } - /** - * A parent viewgroup class which holds the actual suggestion item as a child. - * - * The sole purpose of this class is to draw the given background color when the item is in - * normal state and not draw the background color when it is pressed, so that when pressed the - * list view's selection highlight will be displayed properly (if we draw our background it - * draws on top of the list view selection highlight). - */ - private class SuggestionItemView extends ViewGroup { - /** - * Parses a given HTMl string and manages Spannable variants of the string for different - * states of the suggestion item (selected, pressed and normal). Colors for these different - * states are specified in the html font tag color attribute in the format '@<RESOURCEID>' - * where RESOURCEID is the ID of a ColorStateList or Color resource. - */ - private class MultiStateText { - private CharSequence mNormal = null; // text to display in normal state. - private CharSequence mSelected = null; // text to display in selected state. - private CharSequence mPressed = null; // text to display in pressed state. - private String mPlainText = null; // valid if the text is stateless plain text. - - public MultiStateText(boolean isHtml, String text, Context context) { - if (!isHtml || text == null) { - mPlainText = text; - return; - } - - String textNormal = text; - String textSelected = text; - String textPressed = text; - int textLength = text.length(); - int start = text.indexOf("\"@"); - - // For each font color attribute which has the value in the form '@<RESOURCEID>', - // try to load the resource and create the display strings for the 3 states. - while (start >= 0) { - start++; - int end = text.indexOf("\"", start); - if (end == -1) break; - - String colorIdString = text.substring(start, end); - int colorId = Integer.parseInt(colorIdString.substring(1)); - try { - // The following call works both for color lists and colors. - ColorStateList csl = context.getResources().getColorStateList(colorId); - int normalColor = csl.getColorForState( - View.EMPTY_STATE_SET, csl.getDefaultColor()); - int selectedColor = csl.getColorForState( - View.SELECTED_STATE_SET, csl.getDefaultColor()); - int pressedColor = csl.getColorForState( - View.PRESSED_STATE_SET, csl.getDefaultColor()); - - // Convert the int color values into a hex string, and strip the first 2 - // characters which will be the alpha (html doesn't want this). - textNormal = textNormal.replace(colorIdString, - "#" + Integer.toHexString(normalColor).substring(2)); - textSelected = textSelected.replace(colorIdString, - "#" + Integer.toHexString(selectedColor).substring(2)); - textPressed = textPressed.replace(colorIdString, - "#" + Integer.toHexString(pressedColor).substring(2)); - } catch (Resources.NotFoundException e) { - // Nothing to do. - } - - start = text.indexOf("\"@", end); - } - mNormal = Html.fromHtml(textNormal); - mSelected = Html.fromHtml(textSelected); - mPressed = Html.fromHtml(textPressed); - } - public CharSequence normal() { - return (mPlainText != null) ? mPlainText : mNormal; - } - public CharSequence selected() { - return (mPlainText != null) ? mPlainText : mSelected; - } - public CharSequence pressed() { - return (mPlainText != null) ? mPlainText : mPressed; - } - } - - private int mBackgroundColor; // the background color to draw in normal state. - private View mView; // the suggestion item's view. - private MultiStateText mText1Strings = null; - private MultiStateText mText2Strings = null; - - protected SuggestionItemView(Context context, Cursor cursor) { - // Initialize ourselves - super(context); - mBackgroundColor = 0; // transparent by default. - - // For our layout use the default list item height from the current theme. - TypedValue lineHeight = new TypedValue(); - context.getTheme().resolveAttribute( - com.android.internal.R.attr.searchResultListItemHeight, lineHeight, true); - DisplayMetrics metrics = new DisplayMetrics(); - metrics.setToDefaults(); - AbsListView.LayoutParams layout = new AbsListView.LayoutParams( - AbsListView.LayoutParams.FILL_PARENT, - (int)lineHeight.getDimension(metrics)); - - setLayoutParams(layout); - - // Initialize the child view - mView = SuggestionsAdapter.super.newView(context, cursor, this); - if (mView != null) { - addView(mView, layout.width, layout.height); - mView.setVisibility(View.VISIBLE); - } - } - - private void setInitialTextForView(TextView view, MultiStateText multiState, - String plainText) { - // Set the text even if it's null, since we need to clear any previous text. - CharSequence text = (multiState != null) ? multiState.normal() : plainText; - view.setText(text); - - if (TextUtils.isEmpty(text)) { - view.setVisibility(View.GONE); - } else { - view.setVisibility(View.VISIBLE); - } - } - - public void setTextStrings(String text1, String text2, boolean isHtml, Context context) { - mText1Strings = new MultiStateText(isHtml, text1, context); - mText2Strings = new MultiStateText(isHtml, text2, context); - - ChildViewCache views = (ChildViewCache) getTag(); - setInitialTextForView(views.mText1, mText1Strings, text1); - setInitialTextForView(views.mText2, mText2Strings, text2); - } - - public void updateTextViewContentIfRequired() { - // Check if the pressed or selected state has changed since the last call. - boolean isPressedNow = isPressed(); - boolean isSelectedNow = isSelected(); - - ChildViewCache views = (ChildViewCache) getTag(); - views.mText1.setText((isPressedNow ? mText1Strings.pressed() : - (isSelectedNow ? mText1Strings.selected() : mText1Strings.normal()))); - views.mText2.setText((isPressedNow ? mText2Strings.pressed() : - (isSelectedNow ? mText2Strings.selected() : mText2Strings.normal()))); - } - - public void setColor(int backgroundColor) { - mBackgroundColor = backgroundColor; - } - - @Override - public void dispatchDraw(Canvas canvas) { - updateTextViewContentIfRequired(); - - if (mBackgroundColor != 0 && !isPressed() && !isSelected()) { - canvas.drawColor(mBackgroundColor); - } - super.dispatchDraw(canvas); - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - if (mView != null) { - mView.measure(widthMeasureSpec, heightMeasureSpec); - } - } - - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - if (mView != null) { - mView.layout(0, 0, mView.getMeasuredWidth(), mView.getMeasuredHeight()); - } - } - } - } diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java index 70e1297..380e5fd 100644 --- a/core/java/android/text/Html.java +++ b/core/java/android/text/Html.java @@ -25,6 +25,7 @@ import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; +import android.content.res.ColorStateList; import android.content.res.Resources; import android.graphics.Typeface; import android.graphics.drawable.Drawable; @@ -40,6 +41,7 @@ import android.text.style.StrikethroughSpan; import android.text.style.StyleSpan; import android.text.style.SubscriptSpan; import android.text.style.SuperscriptSpan; +import android.text.style.TextAppearanceSpan; import android.text.style.TypefaceSpan; import android.text.style.URLSpan; import android.text.style.UnderlineSpan; @@ -49,6 +51,7 @@ import com.android.internal.util.XmlUtils; import java.io.IOException; import java.io.StringReader; import java.nio.CharBuffer; +import java.util.HashMap; /** * This class processes HTML strings into displayable styled text. @@ -633,54 +636,25 @@ class HtmlToSpannedConverter implements ContentHandler { if (where != len) { Font f = (Font) obj; - if (f.mColor != null) { - int c = -1; - - if (f.mColor.equalsIgnoreCase("aqua")) { - c = 0x00FFFF; - } else if (f.mColor.equalsIgnoreCase("black")) { - c = 0x000000; - } else if (f.mColor.equalsIgnoreCase("blue")) { - c = 0x0000FF; - } else if (f.mColor.equalsIgnoreCase("fuchsia")) { - c = 0xFF00FF; - } else if (f.mColor.equalsIgnoreCase("green")) { - c = 0x008000; - } else if (f.mColor.equalsIgnoreCase("grey")) { - c = 0x808080; - } else if (f.mColor.equalsIgnoreCase("lime")) { - c = 0x00FF00; - } else if (f.mColor.equalsIgnoreCase("maroon")) { - c = 0x800000; - } else if (f.mColor.equalsIgnoreCase("navy")) { - c = 0x000080; - } else if (f.mColor.equalsIgnoreCase("olive")) { - c = 0x808000; - } else if (f.mColor.equalsIgnoreCase("purple")) { - c = 0x800080; - } else if (f.mColor.equalsIgnoreCase("red")) { - c = 0xFF0000; - } else if (f.mColor.equalsIgnoreCase("silver")) { - c = 0xC0C0C0; - } else if (f.mColor.equalsIgnoreCase("teal")) { - c = 0x008080; - } else if (f.mColor.equalsIgnoreCase("white")) { - c = 0xFFFFFF; - } else if (f.mColor.equalsIgnoreCase("yellow")) { - c = 0xFFFF00; + if (!TextUtils.isEmpty(f.mColor)) { + if (f.mColor.startsWith("@")) { + Resources res = Resources.getSystem(); + String name = f.mColor.substring(1); + int colorRes = res.getIdentifier(name, "color", "android"); + if (colorRes != 0) { + ColorStateList colors = res.getColorStateList(colorRes); + text.setSpan(new TextAppearanceSpan(null, 0, 0, colors, null), + where, len, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + } } else { - try { - c = XmlUtils.convertValueToInt(f.mColor, -1); - } catch (NumberFormatException nfe) { - // Can't understand the color, so just drop it. + int c = getHtmlColor(f.mColor); + if (c != -1) { + text.setSpan(new ForegroundColorSpan(c | 0xFF000000), + where, len, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } } - - if (c != -1) { - text.setSpan(new ForegroundColorSpan(c | 0xFF000000), - where, len, - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - } } if (f.mFace != null) { @@ -843,4 +817,47 @@ class HtmlToSpannedConverter implements ContentHandler { mLevel = level; } } + + private static HashMap<String,Integer> COLORS = buildColorMap(); + + private static HashMap<String,Integer> buildColorMap() { + HashMap<String,Integer> map = new HashMap<String,Integer>(); + map.put("aqua", 0x00FFFF); + map.put("black", 0x000000); + map.put("blue", 0x0000FF); + map.put("fuchsia", 0xFF00FF); + map.put("green", 0x008000); + map.put("grey", 0x808080); + map.put("lime", 0x00FF00); + map.put("maroon", 0x800000); + map.put("navy", 0x000080); + map.put("olive", 0x808000); + map.put("purple", 0x800080); + map.put("red", 0xFF0000); + map.put("silver", 0xC0C0C0); + map.put("teal", 0x008080); + map.put("white", 0xFFFFFF); + map.put("yellow", 0xFFFF00); + return map; + } + + /** + * Converts an HTML color (named or numeric) to an integer RGB value. + * + * @param color Non-null color string. + * @return A color value, or {@code -1} if the color string could not be interpreted. + */ + private static int getHtmlColor(String color) { + Integer i = COLORS.get(color.toLowerCase()); + if (i != null) { + return i; + } else { + try { + return XmlUtils.convertValueToInt(color, -1); + } catch (NumberFormatException nfe) { + return -1; + } + } + } + } diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index f9ca8cb..777beed 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -720,7 +720,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te @Override public void getFocusedRect(Rect r) { View view = getSelectedView(); - if (view != null) { + if (view != null && view.getParent() == this) { // the focused rectangle of the selected view offset into the // coordinate space of this view. view.getFocusedRect(r); diff --git a/core/java/android/widget/Filter.java b/core/java/android/widget/Filter.java index bdecf62..d901540 100644 --- a/core/java/android/widget/Filter.java +++ b/core/java/android/widget/Filter.java @@ -46,6 +46,8 @@ public abstract class Filter { private Handler mThreadHandler; private Handler mResultHandler; + private Delayer mDelayer; + private final Object mLock = new Object(); /** @@ -56,6 +58,20 @@ public abstract class Filter { } /** + * Provide an interface that decides how long to delay the message for a given query. Useful + * for heuristics such as posting a delay for the delete key to avoid doing any work while the + * user holds down the delete key. + * + * @param delayer The delayer. + * @hide + */ + public void setDelayer(Delayer delayer) { + synchronized (mLock) { + mDelayer = delayer; + } + } + + /** * <p>Starts an asynchronous filtering operation. Calling this method * cancels all previous non-executed filtering requests and posts a new * filtering request that will be executed later.</p> @@ -90,6 +106,8 @@ public abstract class Filter { thread.start(); mThreadHandler = new RequestHandler(thread.getLooper()); } + + final long delay = (mDelayer == null) ? 0 : mDelayer.getPostingDelay(constraint); Message message = mThreadHandler.obtainMessage(FILTER_TOKEN); @@ -102,7 +120,7 @@ public abstract class Filter { mThreadHandler.removeMessages(FILTER_TOKEN); mThreadHandler.removeMessages(FINISH_TOKEN); - mThreadHandler.sendMessage(message); + mThreadHandler.sendMessageDelayed(message, delay); } } @@ -289,4 +307,17 @@ public abstract class Filter { */ FilterResults results; } + + /** + * @hide + */ + public interface Delayer { + + /** + * @param constraint The constraint passed to {@link Filter#filter(CharSequence)} + * @return The delay that should be used for + * {@link Handler#sendMessageDelayed(android.os.Message, long)} + */ + long getPostingDelay(CharSequence constraint); + } } diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index 80d688e..bcddca1 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -24,7 +24,6 @@ import android.content.DialogInterface.OnClickListener; import android.content.res.TypedArray; import android.database.DataSetObserver; import android.util.AttributeSet; -import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; @@ -40,6 +39,7 @@ import android.view.ViewGroup; public class Spinner extends AbsSpinner implements OnClickListener { private CharSequence mPrompt; + private AlertDialog mPopup; public Spinner(Context context) { this(context, null); @@ -78,6 +78,16 @@ public class Spinner extends AbsSpinner implements OnClickListener { } } + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + + if (mPopup != null && mPopup.isShowing()) { + mPopup.dismiss(); + mPopup = null; + } + } + /** * <p>A spinner does not support item click events. Calling this method * will raise an exception.</p> @@ -244,7 +254,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { if (mPrompt != null) { builder.setTitle(mPrompt); } - builder.setSingleChoiceItems(adapter, getSelectedItemPosition(), this).show(); + mPopup = builder.setSingleChoiceItems(adapter, getSelectedItemPosition(), this).show(); } return handled; @@ -253,6 +263,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { public void onClick(DialogInterface dialog, int which) { setSelection(which); dialog.dismiss(); + mPopup = null; } /** diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index e7d4694..fd92fbe 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -75,6 +75,9 @@ class AudioTrackJniStorage { int mStreamType; AudioTrackJniStorage() { + mCallbackData.audioTrack_class = 0; + mCallbackData.audioTrack_ref = 0; + mStreamType = AudioSystem::DEFAULT; } ~AudioTrackJniStorage() { @@ -318,6 +321,8 @@ native_init_failure: env->SetIntField(thiz, javaAudioTrackFields.nativeTrackInJavaObj, 0); native_track_failure: + env->DeleteGlobalRef(lpJniStorage->mCallbackData.audioTrack_class); + env->DeleteGlobalRef(lpJniStorage->mCallbackData.audioTrack_ref); delete lpJniStorage; env->SetIntField(thiz, javaAudioTrackFields.jniData, 0); return AUDIOTRACK_ERROR_SETUP_NATIVEINITFAILED; @@ -415,6 +420,9 @@ static void android_media_AudioTrack_native_finalize(JNIEnv *env, jobject thiz) AudioTrackJniStorage* pJniStorage = (AudioTrackJniStorage *)env->GetIntField( thiz, javaAudioTrackFields.jniData); if (pJniStorage) { + // delete global refs created in native_setup + env->DeleteGlobalRef(pJniStorage->mCallbackData.audioTrack_class); + env->DeleteGlobalRef(pJniStorage->mCallbackData.audioTrack_ref); //LOGV("deleting pJniStorage: %x\n", (int)pJniStorage); delete pJniStorage; } diff --git a/core/res/res/drawable/light_header.9.png b/core/res/res/drawable/light_header.9.png Binary files differnew file mode 100644 index 0000000..ad5dce1 --- /dev/null +++ b/core/res/res/drawable/light_header.9.png diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 7d235ec..8eda12e 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -348,7 +348,8 @@ </style> <style name="Widget.TextView.ListSeparator.White"> - <item name="android:textColor">?textColorSecondaryInverse</item> + <item name="android:textColor">?textColorPrimaryInverse</item> + <item name="android:background">@android:drawable/light_header</item> </style> <style name="Widget.EditText"> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index be836eb..e3fffb7 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -325,6 +325,32 @@ <item name="android:windowContentOverlay">@null</item> <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item> <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item> + + <item name="textAppearance">@android:style/TextAppearance</item> + <item name="textAppearanceInverse">@android:style/TextAppearance.Inverse</item> + + <item name="textColorPrimary">@android:color/primary_text_dark</item> + <item name="textColorSecondary">@android:color/secondary_text_dark</item> + <item name="textColorTertiary">@android:color/tertiary_text_dark</item> + <item name="textColorPrimaryInverse">@android:color/primary_text_light</item> + <item name="textColorSecondaryInverse">@android:color/secondary_text_light</item> + <item name="textColorTertiaryInverse">@android:color/tertiary_text_light</item> + <item name="textColorPrimaryDisableOnly">@android:color/primary_text_dark_disable_only</item> + <item name="textColorPrimaryInverseDisableOnly">@android:color/primary_text_light_disable_only</item> + <item name="textColorPrimaryNoDisable">@android:color/primary_text_dark_nodisable</item> + <item name="textColorSecondaryNoDisable">@android:color/secondary_text_dark_nodisable</item> + <item name="textColorPrimaryInverseNoDisable">@android:color/primary_text_light_nodisable</item> + <item name="textColorSecondaryInverseNoDisable">@android:color/secondary_text_light_nodisable</item> + <item name="textColorHint">@android:color/hint_foreground_dark</item> + <item name="textColorHintInverse">@android:color/hint_foreground_light</item> + <item name="textColorSearchUrl">@android:color/search_url_text</item> + + <item name="textAppearanceLarge">@android:style/TextAppearance.Large</item> + <item name="textAppearanceMedium">@android:style/TextAppearance.Medium</item> + <item name="textAppearanceSmall">@android:style/TextAppearance.Small</item> + <item name="textAppearanceLargeInverse">@android:style/TextAppearance.Large.Inverse</item> + <item name="textAppearanceMediumInverse">@android:style/TextAppearance.Medium.Inverse</item> + <item name="textAppearanceSmallInverse">@android:style/TextAppearance.Small.Inverse</item> </style> <!-- Default theme for alert dialog windows, which is used by the diff --git a/libs/utils/ZipUtils.cpp b/libs/utils/ZipUtils.cpp index 5df94cb..9138878 100644 --- a/libs/utils/ZipUtils.cpp +++ b/libs/utils/ZipUtils.cpp @@ -210,7 +210,7 @@ bail: LOGV("+++ reading %ld bytes (%ld left)\n", getSize, compRemaining); - int cc = fread(readBuf, getSize, 1, fp); + int cc = fread(readBuf, 1, getSize, fp); if (cc != (int) getSize) { LOGD("inflate read failed (%d vs %ld)\n", cc, getSize); @@ -341,4 +341,3 @@ bail: return true; } - diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 6de7bc1..3b0a1cc 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -657,7 +657,7 @@ public class MediaScanner ContentValues values = toValues(); String title = values.getAsString(MediaStore.MediaColumns.TITLE); - if (TextUtils.isEmpty(title)) { + if (TextUtils.isEmpty(title.trim())) { title = values.getAsString(MediaStore.MediaColumns.DATA); // extract file name after last slash int lastSlash = title.lastIndexOf('/'); diff --git a/media/sdutils/sdutil.cpp b/media/sdutils/sdutil.cpp index a9aabf0..06120f5 100644 --- a/media/sdutils/sdutil.cpp +++ b/media/sdutils/sdutil.cpp @@ -88,7 +88,7 @@ static int mount(const char* path) { String16 string(path); gMountService->mountMedia(string); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 60; i++) { if (isMounted(path)) { return 0; } @@ -103,7 +103,7 @@ static int unmount(const char* path) { String16 string(path); gMountService->unmountMedia(string); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 20; i++) { if (!isMounted(path)) { return 0; } diff --git a/packages/SettingsProvider/etc/bookmarks.xml b/packages/SettingsProvider/etc/bookmarks.xml index 5fb6608..5af416a 100644 --- a/packages/SettingsProvider/etc/bookmarks.xml +++ b/packages/SettingsProvider/etc/bookmarks.xml @@ -53,6 +53,6 @@ shortcut="s" /> <bookmark package="com.google.android.youtube" - class="com.google.android.youtube.HomePage" + class="com.google.android.youtube.HomeActivity" shortcut="y" /> -</bookmarks>
\ No newline at end of file +</bookmarks> diff --git a/packages/TtsService/src/android/tts/TtsService.java b/packages/TtsService/src/android/tts/TtsService.java index 7c4996e..b3b580c 100755 --- a/packages/TtsService/src/android/tts/TtsService.java +++ b/packages/TtsService/src/android/tts/TtsService.java @@ -130,6 +130,8 @@ public class TtsService extends Service implements OnCompletionListener { private HashMap<String, SoundResource> mUtterances; private MediaPlayer mPlayer; private SpeechItem mCurrentSpeechItem; + private HashMap<SpeechItem, Boolean> mKillList; // Used to ensure that in-flight synth calls + // are killed when stop is used. private TtsService mSelf; private ContentResolver mResolver; @@ -158,6 +160,7 @@ public class TtsService extends Service implements OnCompletionListener { mSpeechQueue = new ArrayList<SpeechItem>(); mPlayer = null; mCurrentSpeechItem = null; + mKillList = new HashMap<SpeechItem, Boolean>(); setDefaultSettings(); } @@ -396,6 +399,7 @@ public class TtsService extends Service implements OnCompletionListener { if ((mCurrentSpeechItem != null) && mCurrentSpeechItem.mCallingApp.equals(callingApp)) { result = nativeSynth.stop(); + mKillList.put(mCurrentSpeechItem, true); if (mPlayer != null) { try { mPlayer.stop(); @@ -445,6 +449,7 @@ public class TtsService extends Service implements OnCompletionListener { ((mCurrentSpeechItem.mType != SpeechItem.TEXT_TO_FILE) || mCurrentSpeechItem.mCallingApp.equals(callingApp))) { result = nativeSynth.stop(); + mKillList.put(mCurrentSpeechItem, true); if (mPlayer != null) { try { mPlayer.stop(); @@ -578,7 +583,10 @@ public class TtsService extends Service implements OnCompletionListener { setLanguage("", language, country, variant); } } - nativeSynth.speak(speechItem.mText, streamType); + // Only do the synthesis if it has not been killed by a subsequent utterance. + if (mKillList.get(speechItem) == null){ + nativeSynth.speak(speechItem.mText, streamType); + } } catch (InterruptedException e) { Log.e("TTS speakInternalOnly", "tryLock interrupted"); e.printStackTrace(); @@ -641,7 +649,10 @@ public class TtsService extends Service implements OnCompletionListener { setLanguage("", language, country, variant); } } - nativeSynth.synthesizeToFile(speechItem.mText, speechItem.mFilename); + // Only do the synthesis if it has not been killed by a subsequent utterance. + if (mKillList.get(speechItem) == null){ + nativeSynth.synthesizeToFile(speechItem.mText, speechItem.mFilename); + } } catch (InterruptedException e) { Log.e("TTS synthToFileInternalOnly", "tryLock interrupted"); e.printStackTrace(); diff --git a/services/java/com/android/server/MountListener.java b/services/java/com/android/server/MountListener.java index 2e430c8..3e53585 100644 --- a/services/java/com/android/server/MountListener.java +++ b/services/java/com/android/server/MountListener.java @@ -202,6 +202,7 @@ final class MountListener implements Runnable { byte[] buffer = new byte[100]; writeCommand(VOLD_CMD_SEND_UMS_STATUS); + mountMedia(Environment.getExternalStorageDirectory().getAbsolutePath()); while (true) { int count = inputStream.read(buffer); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index b038a64..aa1a5cf 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -52,6 +52,7 @@ import java.lang.reflect.InvocationTargetException; class ServerThread extends Thread { private static final String TAG = "SystemServer"; private final static boolean INCLUDE_DEMO = false; + private final static boolean INCLUDE_BACKUP = false; private static final int LOG_BOOT_PROGRESS_SYSTEM_RUN = 3010; @@ -318,8 +319,10 @@ class ServerThread extends Thread { } try { - Log.i(TAG, "Starting Backup Service"); - ServiceManager.addService(Context.BACKUP_SERVICE, new BackupManagerService(context)); + if (INCLUDE_BACKUP) { + Log.i(TAG, "Starting Backup Service"); + ServiceManager.addService(Context.BACKUP_SERVICE, new BackupManagerService(context)); + } } catch (Throwable e) { Log.e(TAG, "Failure starting Backup Service", e); } diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 442e9ce..d9c40ec 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -3522,8 +3522,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen intent = new Intent(intent); // Collect information about the target of the Intent. - // Must do this before locking, because resolving the intent - // may require launching a process to run its content provider. ActivityInfo aInfo; try { ResolveInfo rInfo = @@ -3657,17 +3655,24 @@ public final class ActivityManagerService extends ActivityManagerNative implemen } } - final int startActivityInPackage(int uid, + public final int startActivityInPackage(int uid, Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode, boolean onlyIfNeeded) { + + // This is so super not safe, that only the system (or okay root) + // can do it. + final int callingUid = Binder.getCallingUid(); + if (callingUid != 0 && callingUid != Process.myUid()) { + throw new SecurityException( + "startActivityInPackage only available to the system"); + } + final boolean componentSpecified = intent.getComponent() != null; // Don't modify the client's object! intent = new Intent(intent); // Collect information about the target of the Intent. - // Must do this before locking, because resolving the intent - // may require launching a process to run its content provider. ActivityInfo aInfo; try { ResolveInfo rInfo = @@ -11834,10 +11839,12 @@ public final class ActivityManagerService extends ActivityManagerNative implemen config.reqTouchScreen = mConfiguration.touchscreen; config.reqKeyboardType = mConfiguration.keyboard; config.reqNavigation = mConfiguration.navigation; - if (mConfiguration.navigation != Configuration.NAVIGATION_NONAV) { + if (mConfiguration.navigation == Configuration.NAVIGATION_DPAD + || mConfiguration.navigation == Configuration.NAVIGATION_TRACKBALL) { config.reqInputFeatures |= ConfigurationInfo.INPUT_FEATURE_FIVE_WAY_NAV; } - if (mConfiguration.keyboard != Configuration.KEYBOARD_UNDEFINED) { + if (mConfiguration.keyboard != Configuration.KEYBOARD_UNDEFINED + && mConfiguration.keyboard != Configuration.KEYBOARD_NOKEYS) { config.reqInputFeatures |= ConfigurationInfo.INPUT_FEATURE_HARD_KEYBOARD; } } diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java index 7a8d4e5..a4b47b5 100644 --- a/services/java/com/android/server/status/StatusBarPolicy.java +++ b/services/java/com/android/server/status/StatusBarPolicy.java @@ -626,7 +626,9 @@ public class StatusBarPolicy { && mBatteryThreshold > BATTERY_THRESHOLD_WARNING))) { // Broadcast the low battery warning mSentLowBatteryBroadcast = true; - mContext.sendBroadcast(new Intent(Intent.ACTION_BATTERY_LOW)); + Intent batIntent = new Intent(Intent.ACTION_BATTERY_LOW); + batIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); + mContext.sendBroadcast(batIntent); if (SHOW_LOW_BATTERY_WARNING) { if (false) { @@ -644,7 +646,9 @@ public class StatusBarPolicy { } else if (mBatteryThreshold < BATTERY_THRESHOLD_WARNING) { if (mSentLowBatteryBroadcast == true) { mSentLowBatteryBroadcast = false; - mContext.sendBroadcast(new Intent(Intent.ACTION_BATTERY_OKAY)); + Intent batIntent = new Intent(Intent.ACTION_BATTERY_OKAY); + batIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); + mContext.sendBroadcast(batIntent); } if (SHOW_LOW_BATTERY_WARNING) { if (mLowBatteryDialog != null) { diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java index 0ab9d34..23eedfe 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -18,17 +18,23 @@ package com.android.internal.telephony.cdma; import android.app.ActivityManagerNative; import android.content.Context; +import android.content.ContentValues; import android.content.Intent; +import android.content.res.Configuration; import android.content.SharedPreferences; +import android.database.SQLException; +import android.net.Uri; import android.os.AsyncResult; import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.Registrant; import android.os.RegistrantList; +import android.os.RemoteException; import android.os.SystemProperties; import android.preference.PreferenceManager; import android.provider.Settings; +import android.provider.Telephony; import android.telephony.CellLocation; import android.telephony.PhoneNumberUtils; import android.telephony.ServiceState; @@ -41,6 +47,10 @@ import com.android.internal.telephony.CommandException; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.Connection; import com.android.internal.telephony.DataConnection; +// TODO(Moto): need to move MccTable from telephony.gsm to telephony +// since there is no difference between CDMA and GSM for MccTable and +// CDMA uses gsm's MccTable is not good. +import com.android.internal.telephony.gsm.MccTable; import com.android.internal.telephony.IccCard; import com.android.internal.telephony.IccException; import com.android.internal.telephony.IccFileHandler; @@ -56,6 +66,10 @@ import com.android.internal.telephony.RILConstants; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; +import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA; +import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC; +import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY; + import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -154,6 +168,23 @@ public class CDMAPhone extends PhoneBase { String inEcm=SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE, "false"); mIsPhoneInECMState = inEcm.equals("true"); + // Sets operator alpha property by retrieving from build-time system property + String operatorAlpha = SystemProperties.get("ro.cdma.home.operator.alpha"); + setSystemProperty(PROPERTY_ICC_OPERATOR_ALPHA, operatorAlpha); + + // Sets operator numeric property by retrieving from build-time system property + String operatorNumeric = SystemProperties.get("ro.cdma.home.operator.numeric"); + setSystemProperty(PROPERTY_ICC_OPERATOR_NUMERIC, operatorNumeric); + + // Sets iso country property by retrieving from build-time system property + setIsoCountryProperty(operatorNumeric); + + // Sets current entry in the telephony carrier table + updateCurrentCarrierInProvider(operatorNumeric); + + // Updates MCC MNC device configuration information + updateMccMncConfiguration(operatorNumeric); + // Notify voicemails. notifier.notifyMessageWaitingChanged(this); } @@ -427,13 +458,7 @@ public class CDMAPhone extends PhoneBase { } public String getSubscriberId() { - // Subscriber ID is the combination of MCC+MNC+MIN as CDMA IMSI - // TODO(Moto): Replace with call to mRuimRecords.getIMSI_M() when implemented. - if ((getServiceState().getOperatorNumeric() != null) && (getCdmaMIN() != null)) { - return (getServiceState().getOperatorNumeric() + getCdmaMIN()); - } else { - return null; - } + return mSST.getImsi(); } public boolean canConference() { @@ -1244,4 +1269,66 @@ public class CDMAPhone extends PhoneBase { editor.commit(); } + /** + * Sets PROPERTY_ICC_OPERATOR_ISO_COUNTRY property + * + */ + private void setIsoCountryProperty(String operatorNumeric) { + if (TextUtils.isEmpty(operatorNumeric)) { + setSystemProperty(PROPERTY_ICC_OPERATOR_ISO_COUNTRY, ""); + } else { + String iso = ""; + try { + iso = MccTable.countryCodeForMcc(Integer.parseInt( + operatorNumeric.substring(0,3))); + } catch (NumberFormatException ex) { + Log.w(LOG_TAG, "countryCodeForMcc error" + ex); + } catch (StringIndexOutOfBoundsException ex) { + Log.w(LOG_TAG, "countryCodeForMcc error" + ex); + } + + setSystemProperty(PROPERTY_ICC_OPERATOR_ISO_COUNTRY, iso); + } + } + + /** + * Sets the "current" field in the telephony provider according to the build-time + * operator numeric property + * + * @return true for success; false otherwise. + */ + // TODO(Moto): move this method into PhoneBase, since it looks identical to + // the one in GsmPhone + private boolean updateCurrentCarrierInProvider(String operatorNumeric) { + if (!TextUtils.isEmpty(operatorNumeric)) { + try { + Uri uri = Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "current"); + ContentValues map = new ContentValues(); + map.put(Telephony.Carriers.NUMERIC, operatorNumeric); + getContext().getContentResolver().insert(uri, map); + return true; + } catch (SQLException e) { + Log.e(LOG_TAG, "Can't store current operator", e); + } + } + return false; + } + + /** + * Updates MCC and MNC device configuration information for application retrieving + * correct version of resources + * + */ + private void updateMccMncConfiguration(String operatorNumeric) { + if (operatorNumeric.length() >= 5) { + Configuration config = new Configuration(); + config.mcc = Integer.parseInt(operatorNumeric.substring(0,3)); + config.mnc = Integer.parseInt(operatorNumeric.substring(3)); + try { + ActivityManagerNative.getDefault().updateConfiguration(config); + } catch (RemoteException e) { + Log.e(LOG_TAG, "Can't update configuration", e); + } + } + } } diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index af8e202..23a0520 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -19,11 +19,8 @@ package com.android.internal.telephony.cdma; import android.app.AlarmManager; import android.content.ContentResolver; import android.content.Context; -import android.content.ContentValues; import android.content.Intent; import android.database.ContentObserver; -import android.database.SQLException; -import android.net.Uri; import android.os.AsyncResult; import android.os.Handler; import android.os.Message; @@ -35,7 +32,6 @@ import android.os.SystemProperties; import android.provider.Checkin; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; -import android.provider.Telephony; import android.provider.Telephony.Intents; import android.telephony.ServiceState; import android.telephony.SignalStrength; @@ -64,6 +60,7 @@ import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERAT import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_ISROAMING; import static com.android.internal.telephony.TelephonyProperties.PROPERTY_OPERATOR_NUMERIC; import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA; +import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC; import java.util.Arrays; import java.util.Date; @@ -634,27 +631,6 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { } else { newSS.setOperatorName(opNames[0], opNames[1], opNames[2]); } - - if (!(opNames[2].equals(currentCarrier))) { - // TODO(Moto): jsh asks, "This uses the MCC+MNC of the current registered - // network to set the "current" entry in the APN table. But the correct - // entry should be the MCC+MNC that matches the subscribed operator - // (eg, phone issuer). These can be different when roaming." - try { - // Set the current field of the telephony provider according to - // the CDMA's operator - Uri uri = Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "current"); - ContentValues map = new ContentValues(); - map.put(Telephony.Carriers.NUMERIC, opNames[2]); - cr.insert(uri, map); - // save current carrier for the next time check - currentCarrier = opNames[2]; - } catch (SQLException e) { - Log.e(LOG_TAG, "Can't store current operator", e); - } - } else { - Log.i(LOG_TAG, "current carrier is not changed"); - } } else { Log.w(LOG_TAG, "error parsing opNames"); } @@ -665,8 +641,15 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { if (cdmaSubscription != null && cdmaSubscription.length >= 4) { mMdn = cdmaSubscription[0]; - mHomeSystemId = Integer.parseInt(cdmaSubscription[1], 16); - mHomeNetworkId = Integer.parseInt(cdmaSubscription[2], 16); + // TODO: Only grabbing the first SID/NID for now. + if (cdmaSubscription[1] != null) { + String[] sid = cdmaSubscription[1].split(","); + mHomeSystemId = sid.length > 0 ? Integer.parseInt(sid[0]) : 0; + } + if (cdmaSubscription[2] != null) { + String[] nid = cdmaSubscription[2].split(","); + mHomeNetworkId = nid.length > 0 ? Integer.parseInt(nid[0]) : 0; + } mMin = cdmaSubscription[3]; } else { @@ -1437,4 +1420,19 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { return mMin; } + /** + * Returns IMSI as MCC + MNC + MIN + */ + /*package*/ String getImsi() { + // TODO(Moto): When RUIM is enabled, IMSI will come from RUIM + // not build-time props. Moto will provide implementation + // for RUIM-ready case later. + String operatorNumeric = SystemProperties.get(PROPERTY_ICC_OPERATOR_NUMERIC, ""); + + if (!TextUtils.isEmpty(operatorNumeric) && getCdmaMin() != null) { + return (operatorNumeric + getCdmaMin()); + } else { + return null; + } + } } diff --git a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java index c7e61da..55f48b1 100644 --- a/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java +++ b/telephony/java/com/android/internal/telephony/cdma/RuimRecords.java @@ -55,8 +55,6 @@ public final class RuimRecords extends IccRecords { private String mImsi; private String mMyMobileNumber; - private String mSid; - private String mNid; private String mMin2Min1; private String mPrlVersion; @@ -125,21 +123,12 @@ public final class RuimRecords extends IccRecords { adnCache.reset(); - phone.setSystemProperty(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, null); - phone.setSystemProperty(TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY, null); - // recordsRequested is set to false indicating that the SIM // read requests made so far are not valid. This is set to // true only when fresh set of read requests are made. recordsRequested = false; } - /** Returns null if RUIM is not yet ready */ - public String getIMSI_M() { - // TODO(Moto): mImsi is not initialized, fix. - return mImsi; - } - public String getMdnNumber() { return mMyMobileNumber; } @@ -242,8 +231,6 @@ public final class RuimRecords extends IccRecords { m_ota_commited = false; } mMyMobileNumber = localTemp[0]; - mSid = localTemp[1]; - mNid = localTemp[2]; mMin2Min1 = localTemp[3]; mPrlVersion = localTemp[4]; diff --git a/tests/AndroidTests/src/com/android/unit_tests/HtmlTest.java b/tests/AndroidTests/src/com/android/unit_tests/HtmlTest.java index 27da4f1..027730f 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/HtmlTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/HtmlTest.java @@ -16,11 +16,25 @@ package com.android.unit_tests; +import android.content.res.ColorStateList; +import android.content.res.Resources; import android.graphics.Typeface; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; -import android.text.*; -import android.text.style.*; +import android.text.Html; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.Spanned; +import android.text.style.ForegroundColorSpan; +import android.text.style.QuoteSpan; +import android.text.style.StrikethroughSpan; +import android.text.style.StyleSpan; +import android.text.style.SubscriptSpan; +import android.text.style.SuperscriptSpan; +import android.text.style.TextAppearanceSpan; +import android.text.style.TypefaceSpan; +import android.text.style.URLSpan; +import android.text.style.UnderlineSpan; import junit.framework.TestCase; @@ -35,14 +49,54 @@ public class HtmlTest extends TestCase { s = Html.fromHtml("<font color=\"#00FF00\">something</font>"); colors = s.getSpans(0, s.length(), ForegroundColorSpan.class); - assertEquals(colors[0].getForegroundColor(), 0xFF00FF00); + assertEquals(1, colors.length); + assertEquals(0xFF00FF00, colors[0].getForegroundColor()); s = Html.fromHtml("<font color=\"navy\">something</font>"); colors = s.getSpans(0, s.length(), ForegroundColorSpan.class); - assertEquals(colors[0].getForegroundColor(), 0xFF000080); + assertEquals(1, colors.length); + assertEquals(0xFF000080, colors[0].getForegroundColor()); s = Html.fromHtml("<font color=\"gibberish\">something</font>"); colors = s.getSpans(0, s.length(), ForegroundColorSpan.class); + assertEquals(0, colors.length); + } + + @MediumTest + public void testResourceColor() throws Exception { + ColorStateList c = + Resources.getSystem().getColorStateList(android.R.color.primary_text_dark); + Spanned s; + TextAppearanceSpan[] colors; + + s = Html.fromHtml("<font color=\"@android:color/primary_text_dark\">something</font>"); + colors = s.getSpans(0, s.length(), TextAppearanceSpan.class); + assertEquals(1, colors.length); + assertEquals(c.toString(), colors[0].getTextColor().toString()); + + s = Html.fromHtml("<font color=\"@android:primary_text_dark\">something</font>"); + colors = s.getSpans(0, s.length(), TextAppearanceSpan.class); + assertEquals(1, colors.length); + assertEquals(c.toString(), colors[0].getTextColor().toString()); + + s = Html.fromHtml("<font color=\"@color/primary_text_dark\">something</font>"); + colors = s.getSpans(0, s.length(), TextAppearanceSpan.class); + assertEquals(1, colors.length); + assertEquals(c.toString(), colors[0].getTextColor().toString()); + + s = Html.fromHtml("<font color=\"@primary_text_dark\">something</font>"); + colors = s.getSpans(0, s.length(), TextAppearanceSpan.class); + assertEquals(1, colors.length); + assertEquals(c.toString(), colors[0].getTextColor().toString()); + + s = Html.fromHtml("<font color=\"@" + android.R.color.primary_text_dark + + "\">something</font>"); + colors = s.getSpans(0, s.length(), TextAppearanceSpan.class); + assertEquals(1, colors.length); + assertEquals(c.toString(), colors[0].getTextColor().toString()); + + s = Html.fromHtml("<font color=\"gibberish\">something</font>"); + colors = s.getSpans(0, s.length(), TextAppearanceSpan.class); assertEquals(colors.length, 0); } diff --git a/tests/AndroidTests/src/com/android/unit_tests/activity/ServiceTest.java b/tests/AndroidTests/src/com/android/unit_tests/activity/ServiceTest.java index db523dc..95f6e36 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/activity/ServiceTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/activity/ServiceTest.java @@ -27,10 +27,14 @@ import android.os.IBinder; import android.os.Parcel; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.SmallTest; +import android.test.suitebuilder.annotation.Suppress; import android.util.Log; // These test binders purport to support an interface whose canonical // interface name is ServiceTest.SERVICE_LOCAL +// Temporarily suppress, this test is causing unit test suite run to fail +// TODO: remove this suppress +@Suppress public class ServiceTest extends ActivityTestsBase { public static final String SERVICE_LOCAL = @@ -131,7 +135,7 @@ public class ServiceTest extends ActivityTestsBase { mSetReporter = setReporter; mMonitor = !setReporter; } - + void setMonitor(boolean v) { mMonitor = v; } @@ -148,7 +152,7 @@ public class ServiceTest extends ActivityTestsBase { } data.recycle(); } - + if (mMonitor) { mCount++; if (mStartState == STATE_START_1) { @@ -260,7 +264,7 @@ public class ServiceTest extends ActivityTestsBase { waitForResultOrThrow(5 * 1000, "existing connection to lose service"); getContext().unbindService(conn); - + conn = new TestConnection(true, true); success = false; try { @@ -290,7 +294,7 @@ public class ServiceTest extends ActivityTestsBase { waitForResultOrThrow(5 * 1000, "existing connection to lose service"); getContext().unbindService(conn); - + conn = new TestConnection(true, true); success = false; try { @@ -318,12 +322,12 @@ public class ServiceTest extends ActivityTestsBase { mStartState = STATE_UNBIND_ONLY; getContext().unbindService(conn); waitForResultOrThrow(5 * 1000, "existing connection to unbind service"); - + // Expect to see the service rebound. mStartState = STATE_REBIND; getContext().bindService(service, conn, 0); waitForResultOrThrow(5 * 1000, "existing connection to rebind service"); - + // Expect to see the service unbind and then destroyed. mStartState = STATE_UNBIND; getContext().stopService(service); |
