Skip to content

wearable: restore ClientIdentity population in WearableLocationService #3478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
js360000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wearable: restore ClientIdentity population in WearableLocationService #3478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions ...wearable/core/src/main/java/org/microg/gms/wearable/location/WearableLocationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.microg.gms.wearable.location;

import android.content.Context;
import android.content.pm.PackageManager;
import android.util.Log;

import com.google.android.gms.common.api.GoogleApiClient;
Expand Down Expand Up @@ -139,12 +140,21 @@ private static LocationRequestInternal readLocationRequest(DataMap dataMap, Cont
}

private static ClientIdentity generateClientIdentity(String packageName, Context context) {
return null;
/*try {
return new ClientIdentity(context.getPackageManager().getApplicationInfo(packageName, 0).uid, packageName);
// Previously returned null, which produced null-bearing
// List<ClientIdentity> entries downstream and made the per-client UID
// path on the watch-side unusable. ClientIdentity is now an
// AutoSafeParcelable with public fields rather than a constructor, so
// populate the fields directly and fall back to the host package when
// the wearable-supplied package name is not installed.
ClientIdentity identity = new ClientIdentity();
try {
identity.uid = context.getPackageManager().getApplicationInfo(packageName, 0).uid;
identity.packageName = packageName;
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Unknown client identity: " + packageName, e);
return new ClientIdentity(context.getApplicationInfo().uid, context.getPackageName());
}*/
identity.uid = context.getApplicationInfo().uid;
identity.packageName = context.getPackageName();
}
return identity;
}
}