Remove more face unlock blobs and unbreak camera on Pixel 4 series

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-08-26 17:50:21 -04:00
parent 8e1c05d920
commit bf55f7d572
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
3 changed files with 19 additions and 10 deletions

View File

@ -33,10 +33,10 @@ index cc485f7..7cdfb93 100644
android:allowBackup="false" android:allowBackup="false"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java diff --git a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
index c359575..a4f7e37 100644 index 25ca0b8..4dbc077 100644
--- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java --- a/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
+++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java +++ b/app/src/main/java/org/lineageos/updater/UpdatesActivity.java
@@ -398,10 +398,14 @@ public class UpdatesActivity extends UpdatesListActivity { @@ -473,10 +473,14 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
final DownloadClient downloadClient; final DownloadClient downloadClient;
try { try {
@ -51,7 +51,7 @@ index c359575..a4f7e37 100644
.build(); .build();
} catch (IOException exception) { } catch (IOException exception) {
Log.e(TAG, "Could not build download client"); Log.e(TAG, "Could not build download client");
@@ -501,6 +505,7 @@ public class UpdatesActivity extends UpdatesListActivity { @@ -580,6 +584,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
private void showPreferencesDialog() { private void showPreferencesDialog() {
View view = LayoutInflater.from(this).inflate(R.layout.preferences_dialog, null); View view = LayoutInflater.from(this).inflate(R.layout.preferences_dialog, null);
Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval); Spinner autoCheckInterval = view.findViewById(R.id.preferences_auto_updates_check_interval);
@ -59,7 +59,7 @@ index c359575..a4f7e37 100644
SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates); SwitchCompat autoDelete = view.findViewById(R.id.preferences_auto_delete_updates);
SwitchCompat meteredNetworkWarning = view.findViewById( SwitchCompat meteredNetworkWarning = view.findViewById(
R.id.preferences_metered_network_warning); R.id.preferences_metered_network_warning);
@@ -513,6 +518,7 @@ public class UpdatesActivity extends UpdatesListActivity { @@ -592,6 +597,7 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this)); autoCheckInterval.setSelection(Utils.getUpdateCheckSetting(this));
@ -67,7 +67,7 @@ index c359575..a4f7e37 100644
autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false)); autoDelete.setChecked(prefs.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, false));
meteredNetworkWarning.setChecked(prefs.getBoolean(Constants.PREF_METERED_NETWORK_WARNING, meteredNetworkWarning.setChecked(prefs.getBoolean(Constants.PREF_METERED_NETWORK_WARNING,
prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true))); prefs.getBoolean(Constants.PREF_MOBILE_DATA_WARNING, true)));
@@ -553,6 +559,8 @@ public class UpdatesActivity extends UpdatesListActivity { @@ -632,6 +638,8 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
prefs.edit() prefs.edit()
.putInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL, .putInt(Constants.PREF_AUTO_UPDATES_CHECK_INTERVAL,
autoCheckInterval.getSelectedItemPosition()) autoCheckInterval.getSelectedItemPosition())
@ -76,7 +76,7 @@ index c359575..a4f7e37 100644
.putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked()) .putBoolean(Constants.PREF_AUTO_DELETE_UPDATES, autoDelete.isChecked())
.putBoolean(Constants.PREF_METERED_NETWORK_WARNING, .putBoolean(Constants.PREF_METERED_NETWORK_WARNING,
meteredNetworkWarning.isChecked()) meteredNetworkWarning.isChecked())
@@ -566,6 +574,10 @@ public class UpdatesActivity extends UpdatesListActivity { @@ -645,6 +653,10 @@ public class UpdatesActivity extends UpdatesListActivity implements UpdateImport
UpdatesCheckReceiver.cancelUpdatesCheck(this); UpdatesCheckReceiver.cancelUpdatesCheck(this);
} }
@ -107,7 +107,7 @@ index 9f45423..382fbd4 100644
downloadClient.start(); downloadClient.start();
} catch (IOException e) { } catch (IOException e) {
diff --git a/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java b/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java diff --git a/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java b/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java
index 5d7d51a..7ac5f5b 100644 index daa710c..1e51c5b 100644
--- a/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java --- a/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java
+++ b/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java +++ b/app/src/main/java/org/lineageos/updater/controller/UpdaterController.java
@@ -374,12 +374,16 @@ public class UpdaterController { @@ -374,12 +374,16 @@ public class UpdaterController {
@ -376,7 +376,7 @@ index c1b4356..93f1bfc 100644
android:id="@+id/preferences_auto_delete_updates" android:id="@+id/preferences_auto_delete_updates"
android:layout_width="match_parent" android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 18e3ede..e92eb1d 100644 index 02dda7f..3fbfbb5 100644
--- a/app/src/main/res/values/strings.xml --- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml
@@ -70,6 +70,7 @@ @@ -70,6 +70,7 @@

View File

@ -231,6 +231,10 @@ echo "Deblobbing...";
#Face Unlock [Google] #Face Unlock [Google]
blobs=$blobs"|libfacenet.so|libfilterpack_facedetect.so|libfrsdk.so"; blobs=$blobs"|libfacenet.so|libfilterpack_facedetect.so|libfrsdk.so";
blobs=$blobs"|android.hardware.biometrics.face.*"; #depends on airbrush
blobs=$blobs"|manifest_face.xml";
#blobs=$blobs"|firmware/faceauth";
makes=$makes"|android.hardware.biometrics.face.*";
#GPS [Qualcomm] #GPS [Qualcomm]
#blobs=$blobs"|gpsd"; #blobs=$blobs"|gpsd";
@ -438,6 +442,10 @@ echo "Deblobbing...";
blobs=$blobs"|gpsone_daemon|izat.xt.srv|location-mq|loc_launcher|lowi-server|slim_ap_daemon|slim_daemon|xtwifi-client|xtwifi-inet-agent|xtra-daemon|garden_app"; blobs=$blobs"|gpsone_daemon|izat.xt.srv|location-mq|loc_launcher|lowi-server|slim_ap_daemon|slim_daemon|xtwifi-client|xtwifi-inet-agent|xtra-daemon|garden_app";
overlay=$overlay"|config_comboNetworkLocationProvider|config_enableFusedLocationOverlay|config_enableNetworkLocationOverlay|config_fusedLocationProviderPackageName|config_enableNetworkLocationOverlay|config_networkLocationProviderPackageName|com.qualcomm.location"; overlay=$overlay"|config_comboNetworkLocationProvider|config_enableFusedLocationOverlay|config_enableNetworkLocationOverlay|config_fusedLocationProviderPackageName|config_enableNetworkLocationOverlay|config_networkLocationProviderPackageName|com.qualcomm.location";
#Machine Learning [Google]
#blobs=$blobs"|libdarwinn_client.so|libdarwinn_compiler.so|libdarwinn_hal.so"; #breaks camera
#blobs=$blobs"|vendor.google.darwinn.service.*";
#Machine Learning [Qualcomm] #Machine Learning [Qualcomm]
#blobs=$blobs"|vendor.qti.hardware.mlshal.*|vendor.qti.hardware.cvp.*"; #blobs=$blobs"|vendor.qti.hardware.mlshal.*|vendor.qti.hardware.cvp.*";
#blobs=$blobs"|libopenvx.so|libnpu.so|libcvp.*.so"; #XXX: breaks camera #blobs=$blobs"|libopenvx.so|libnpu.so|libcvp.*.so"; #XXX: breaks camera
@ -450,7 +458,6 @@ echo "Deblobbing...";
blobs=$blobs"|oslo.so|oslo.napp_header"; blobs=$blobs"|oslo.so|oslo.napp_header";
blobs=$blobs"|BufferConfigValOslo.bin|OsloSensorConfig.bin|OsloSensorPackage.bin"; blobs=$blobs"|BufferConfigValOslo.bin|OsloSensorConfig.bin|OsloSensorPackage.bin";
blobs=$blobs"|vendor.google.airbrush.*|libairbrush-pixel.so"; blobs=$blobs"|vendor.google.airbrush.*|libairbrush-pixel.so";
blobs=$blobs"|libdarwinn_client.so|libdarwinn_compiler.so|vendor.google.darwinn.service.*";
#blobs=$blobs"|pixelatoms-cpp.so|vendor-pixelatoms-cpp.so"; #??? #blobs=$blobs"|pixelatoms-cpp.so|vendor-pixelatoms-cpp.so"; #???
#Music Detection [Google] #Music Detection [Google]
@ -881,6 +888,8 @@ deblobVendorBp() {
sed -i ':a;N;s/\n/&/3;Ta;/manifest_android.hardware.drm-service.widevine.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile"; sed -i ':a;N;s/\n/&/3;Ta;/manifest_android.hardware.drm-service.widevine.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/manifest_vendor.xiaomi.hardware.mlipay.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile"; sed -i ':a;N;s/\n/&/3;Ta;/manifest_vendor.xiaomi.hardware.mlipay.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/vendor.qti.hardware.radio.atcmdfwd@1.0.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile"; sed -i ':a;N;s/\n/&/3;Ta;/vendor.qti.hardware.radio.atcmdfwd@1.0.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/android.hardware.biometrics.face-service.22.pixel.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/manifest_face.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
} }
export -f deblobVendorBp; export -f deblobVendorBp;
# #

View File

@ -61,7 +61,7 @@ buildAll() {
buildDevice walleye avb; buildDevice walleye avb;
buildDevice cheeseburger verity; buildDevice cheeseburger verity;
buildDevice dumpling verity; buildDevice dumpling verity;
buildDevice mata verity; #unb buildDevice mata verity;
buildDevice cheryl verity; buildDevice cheryl verity;
#SD435 #SD435
buildDevice Mi8937; buildDevice Mi8937;