summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityThread.java26
-rw-r--r--core/java/android/app/AppGlobals.java7
-rw-r--r--core/java/android/net/ConnectivityManager.java28
-rw-r--r--core/java/android/net/MobileDataStateTracker.java9
-rw-r--r--core/java/android/provider/Telephony.java8
-rw-r--r--core/java/android/webkit/WebView.java3
-rw-r--r--core/java/android/webkit/ZoomManager.java2
7 files changed, 26 insertions, 57 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index b409f2f..bd83762 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -200,6 +200,8 @@ public final class ActivityThread {
static Handler sMainThreadHandler; // set once in main()
+ Bundle mCoreSettings = null;
+
private static final class ActivityClientRecord {
IBinder token;
int ident;
@@ -354,7 +356,6 @@ public final class ActivityThread {
boolean restrictedBackupMode;
Configuration config;
boolean handlingProfiling;
- Bundle coreSettings;
public String toString() {
return "AppBindData{appInfo=" + appInfo + "}";
}
@@ -559,6 +560,8 @@ public final class ActivityThread {
ServiceManager.initServiceCache(services);
}
+ setCoreSettings(coreSettings);
+
AppBindData data = new AppBindData();
data.processName = processName;
data.appInfo = appInfo;
@@ -570,7 +573,6 @@ public final class ActivityThread {
data.debugMode = debugMode;
data.restrictedBackupMode = isRestrictedBackupMode;
data.config = config;
- data.coreSettings = coreSettings;
queueOrSendMessage(H.BIND_APPLICATION, data);
}
@@ -898,8 +900,8 @@ public final class ActivityThread {
pw.println(String.format(format, objs));
}
- public void setCoreSettings(Bundle settings) {
- queueOrSendMessage(H.SET_CORE_SETTINGS, settings);
+ public void setCoreSettings(Bundle coreSettings) {
+ queueOrSendMessage(H.SET_CORE_SETTINGS, coreSettings);
}
}
@@ -2720,10 +2722,8 @@ public final class ActivityThread {
}
private void handleSetCoreSettings(Bundle coreSettings) {
- if (mBoundApplication != null) {
- synchronized (mBoundApplication) {
- mBoundApplication.coreSettings = coreSettings;
- }
+ synchronized (mPackages) {
+ mCoreSettings = coreSettings;
}
}
@@ -3990,13 +3990,9 @@ public final class ActivityThread {
}
public int getIntCoreSetting(String key, int defaultValue) {
- if (mBoundApplication == null) {
- return defaultValue;
- }
- synchronized (mBoundApplication) {
- Bundle coreSettings = mBoundApplication.coreSettings;
- if (coreSettings != null) {
- return coreSettings.getInt(key, defaultValue);
+ synchronized (mPackages) {
+ if (mCoreSettings != null) {
+ return mCoreSettings.getInt(key, defaultValue);
} else {
return defaultValue;
}
diff --git a/core/java/android/app/AppGlobals.java b/core/java/android/app/AppGlobals.java
index 55515b8..2b6db8b 100644
--- a/core/java/android/app/AppGlobals.java
+++ b/core/java/android/app/AppGlobals.java
@@ -55,6 +55,11 @@ public class AppGlobals {
* @return The core settings.
*/
public static int getIntCoreSetting(String key, int defaultValue) {
- return ActivityThread.currentActivityThread().getIntCoreSetting(key, defaultValue);
+ ActivityThread currentActivityThread = ActivityThread.currentActivityThread();
+ if (currentActivityThread != null) {
+ return currentActivityThread.getIntCoreSetting(key, defaultValue);
+ } else {
+ return defaultValue;
+ }
}
}
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 26f375d..cab8ed2 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -221,32 +221,12 @@ public class ConnectivityManager
/** {@hide} */
public static final int TYPE_DUMMY = 8;
-
/** {@hide} */
public static final int TYPE_ETHERNET = 9;
- /**
- * Over the air Adminstration.
- * {@hide}
- */
- public static final int TYPE_MOBILE_FOTA = 10;
-
- /**
- * IP Multimedia Subsystem
- * {@hide}
- */
- public static final int TYPE_MOBILE_IMS = 11;
-
- /**
- * Carrier Branded Services
- * {@hide}
- */
- public static final int TYPE_MOBILE_CBS = 12;
-
- /** {@hide} */
- public static final int MAX_RADIO_TYPE = TYPE_MOBILE_CBS;
-
- /** {@hide} */
- public static final int MAX_NETWORK_TYPE = TYPE_MOBILE_CBS;
+ /** {@hide} TODO: Need to adjust this for WiMAX. */
+ public static final int MAX_RADIO_TYPE = TYPE_DUMMY;
+ /** {@hide} TODO: Need to adjust this for WiMAX. */
+ public static final int MAX_NETWORK_TYPE = TYPE_DUMMY;
public static final int DEFAULT_NETWORK_PREFERENCE = TYPE_WIFI;
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java
index 5b4da66..e04964e 100644
--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -437,8 +437,7 @@ public class MobileDataStateTracker implements NetworkStateTracker {
retValue = true;
break;
case Phone.APN_REQUEST_STARTED:
- // set IDLE here , avoid the following second FAILED not sent out
- mNetworkInfo.setDetailedState(DetailedState.IDLE, null, null);
+ // no need to do anything - we're already due some status update intents
retValue = true;
break;
case Phone.APN_REQUEST_FAILED:
@@ -547,12 +546,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
return Phone.APN_TYPE_DUN;
case ConnectivityManager.TYPE_MOBILE_HIPRI:
return Phone.APN_TYPE_HIPRI;
- case ConnectivityManager.TYPE_MOBILE_FOTA:
- return Phone.APN_TYPE_FOTA;
- case ConnectivityManager.TYPE_MOBILE_IMS:
- return Phone.APN_TYPE_IMS;
- case ConnectivityManager.TYPE_MOBILE_CBS:
- return Phone.APN_TYPE_CBS;
default:
sloge("Error mapping networkType " + netType + " to apnType.");
return null;
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index d2d2557..62f66b6 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -1723,14 +1723,6 @@ public final class Telephony {
public static final String TYPE = "type";
- public static final String INACTIVE_TIMER = "inactivetimer";
-
- // Only if enabled try Data Connection.
- public static final String ENABLED = "enabled";
-
- // Rules apply based on class.
- public static final String CLASS = "class";
-
/**
* The protocol to be used to connect to this APN.
*
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 975f815..642cd02 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5036,6 +5036,9 @@ public class WebView extends AbsoluteLayout
* @hide pending API Council approval.
*/
public SearchBox getSearchBox() {
+ if ((mWebViewCore == null) || (mWebViewCore.getBrowserFrame() == null)) {
+ return null;
+ }
return mWebViewCore.getBrowserFrame().getSearchBox();
}
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 28f64a9..f27ced8 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -169,7 +169,7 @@ class ZoomManager {
private int mInitialScrollY;
private long mZoomStart;
- private static final int ZOOM_ANIMATION_LENGTH = 500;
+ private static final int ZOOM_ANIMATION_LENGTH = 175;
// whether support multi-touch
private boolean mSupportMultiTouch;
generated by cgit v1.1 at 2025-08-04 04:33:05 +0000