Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Update non-framework emergency location request notification" into qt-dev am: d566984298 am: 6d8da46657" into qt-r1-dev-plus-aosp

Browse Source 
am: 22c9978625

Change-Id: Ief2edb3b9005301d56efa1d52358b06680f00687
This commit is contained in:
Anil Admal
2019-05-22 16:03:09 -07:00
committed by android-build-merger
parent f87a37b9ba 22c9978625
commit dae874bf30
4 changed files with 53 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
location/java/com/android/internal/location/GpsNetInitiatedHandler.java
View File

@@ -360,7 +360,7 @@ public class GpsNetInitiatedHandler {
/**
* Posts a notification in the status bar using the contents in {@code notif} object.
*/
public synchronized void setNiNotification(GpsNiNotification notif) {
private synchronized void setNiNotification(GpsNiNotification notif) {
NotificationManager notificationManager = (NotificationManager) mContext
.getSystemService(Context.NOTIFICATION_SERVICE);
if (notificationManager == null) {
@@ -541,35 +541,26 @@ public class GpsNetInitiatedHandler {
*/
static private String decodeString(String original, boolean isHex, int coding)
{
if (coding == GPS_ENC_NONE) {
if (coding == GPS_ENC_NONE || coding == GPS_ENC_UNKNOWN) {
return original;
}
String decoded = original;
byte[] input = stringToByteArray(original, isHex);
switch (coding) {
case GPS_ENC_SUPL_GSM_DEFAULT:
decoded = decodeGSMPackedString(input);
break;
case GPS_ENC_SUPL_GSM_DEFAULT:
return decodeGSMPackedString(input);
case GPS_ENC_SUPL_UTF8:
decoded = decodeUTF8String(input);
break;
case GPS_ENC_SUPL_UTF8:
return decodeUTF8String(input);
case GPS_ENC_SUPL_UCS2:
decoded = decodeUCS2String(input);
break;
case GPS_ENC_SUPL_UCS2:
return decodeUCS2String(input);
case GPS_ENC_UNKNOWN:
decoded = original;
break;
default:
Log.e(TAG, "Unknown encoding " + coding + " for NI text " + original);
break;
default:
Log.e(TAG, "Unknown encoding " + coding + " for NI text " + original);
return original;
}
return decoded;
}
// change this to configure notification display