Merge "[log] debug getDataNetworkType" into main (0e28a055) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -3371,14 +3371,13 @@ public class TelephonyManager {
		return telephony.getDataNetworkTypeForSubscriber(subId, getOpPackageName(),
		getAttributionTag());
		} else {
		// This can happen when the ITelephony interface is not up yet.
		Log.e(TAG, "getDataNetworkType: ITelephony interface is not up yet");
		return NETWORK_TYPE_UNKNOWN;
		}
		} catch(RemoteException ex) {
		// This shouldn't happen in the normal case
		return NETWORK_TYPE_UNKNOWN;
		} catch (NullPointerException ex) {
		// This could happen before phone restarts due to crashing
		} catch (RemoteException // Shouldn't happen in the normal case
		\| NullPointerException ex // Could happen before phone restarts due to crashing
		) {
		Log.e(TAG, "getDataNetworkType: " + ex.getMessage());
		return NETWORK_TYPE_UNKNOWN;
		}
		}