mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
11.0: More fixes
This commit is contained in:
Tad
parent
68f77e0a23
commit
05a5c7c38c
@ -23,8 +23,6 @@
|
||||
<remove-project name="LineageOS/android_packages_apps_VideoEditor" />
|
||||
<remove-project name="LineageOS/android_packages_apps_VoiceDialer" />
|
||||
<remove-project name="LineageOS/android_packages_apps_VoicePlus" />
|
||||
<remove-project name="LineageOS/android_packages_inputmethods_OpenWnn" />
|
||||
<remove-project name="LineageOS/android_packages_inputmethods_PinyinIME" />
|
||||
<remove-project name="LineageOS/android_packages_providers_PartnerBookmarksProvider" />
|
||||
<remove-project name="LineageOS/android_packages_screensavers_Basic" />
|
||||
<remove-project name="LineageOS/android_packages_screensavers_PhotoTable" />
|
||||
@ -32,7 +30,6 @@
|
||||
<remove-project name="LineageOS/android_packages_wallpapers_Basic" />
|
||||
<remove-project name="LineageOS/android_packages_wallpapers_Galaxy4" />
|
||||
<remove-project name="LineageOS/android_packages_wallpapers_HoloSpiral" />
|
||||
<remove-project name="LineageOS/android_packages_wallpapers_LivePicker" />
|
||||
<remove-project name="LineageOS/android_packages_wallpapers_MagicSmoke" />
|
||||
<remove-project name="LineageOS/android_packages_wallpapers_MusicVisualization" />
|
||||
<remove-project name="LineageOS/android_packages_wallpapers_NoiseField" />
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
From b003bf4b46743dc3b1b566196e8ee9ece4c1ade0 Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Sun, 11 Dec 2016 22:15:28 -0500
|
||||
Subject: [PATCH] Fixes
|
||||
|
||||
Change-Id: I53c657f52a7c8fd39655a9acba8e9c0a633fd329
|
||||
---
|
||||
BoardConfig.mk | 5 +++++
|
||||
charger/Android.mk | 2 +-
|
||||
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/BoardConfig.mk b/BoardConfig.mk
|
||||
index 726c947..c11a418 100644
|
||||
--- a/BoardConfig.mk
|
||||
+++ b/BoardConfig.mk
|
||||
@@ -192,3 +192,8 @@ TW_FLASH_FROM_STORAGE := true
|
||||
TW_BRIGHTNESS_PATH := /sys/class/leds/lcd-backlight/brightness
|
||||
TW_MAX_BRIGHTNESS := 255
|
||||
TW_INPUT_BLACKLIST := lis3dh_acc
|
||||
+
|
||||
+# Use retire fence from MDP driver
|
||||
+TARGET_DISPLAY_USE_RETIRE_FENCE := true
|
||||
+
|
||||
+
|
||||
diff --git a/charger/Android.mk b/charger/Android.mk
|
||||
index 14c26dd..0fcc178 100644
|
||||
--- a/charger/Android.mk
|
||||
+++ b/charger/Android.mk
|
||||
@@ -20,7 +20,7 @@ LOCAL_STATIC_LIBRARIES := libminui libpixelflinger_static libpng
|
||||
ifeq ($(strip $(BOARD_CHARGER_ENABLE_SUSPEND)),true)
|
||||
LOCAL_STATIC_LIBRARIES += libsuspend
|
||||
endif
|
||||
-LOCAL_STATIC_LIBRARIES += libz libstdc++ libcutils liblog libm libc
|
||||
+LOCAL_STATIC_LIBRARIES += libz libstdc++ libcutils liblog libm libc libutils
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
--
|
||||
2.9.3
|
||||
@ -0,0 +1,25 @@
|
||||
From fc786df1d3a1f6012863f042f34b2bc0b9a0bd2f Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Sun, 11 Dec 2016 23:23:58 -0500
|
||||
Subject: [PATCH] Change DPI
|
||||
|
||||
Change-Id: Ia9059e0b554fec09ab73f961b09cf6316aeaa9c9
|
||||
---
|
||||
system.prop | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/system.prop b/system.prop
|
||||
index 4f7a90c..9cdb394 100644
|
||||
--- a/system.prop
|
||||
+++ b/system.prop
|
||||
@@ -27,7 +27,7 @@ DEVICE_PROVISIONED=1
|
||||
debug.sf.hw=1
|
||||
debug.egl.hw=1
|
||||
debug.composition.type=gpu
|
||||
-ro.sf.lcd_density=240
|
||||
+ro.sf.lcd_density=180
|
||||
dalvik.vm.heapsize=36m
|
||||
debug.enable.wl_log=1
|
||||
debug.mdpcomp.maxlayer=4
|
||||
--
|
||||
2.9.3
|
||||
@ -0,0 +1,24 @@
|
||||
From f67900ad9370a7e7f0186b3f459dad2c74db7aae Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Sun, 11 Dec 2016 23:15:20 -0500
|
||||
Subject: [PATCH] Fixes
|
||||
|
||||
Change-Id: I55eb4f1af258b649ddc36bd822d9b28f9fd64ce9
|
||||
---
|
||||
include/linux/msm_mdp.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/linux/msm_mdp.h b/include/linux/msm_mdp.h
|
||||
index 8f829ef..cf6d3d0 100644
|
||||
--- a/include/linux/msm_mdp.h
|
||||
+++ b/include/linux/msm_mdp.h
|
||||
@@ -574,6 +574,7 @@ struct mdp_buf_sync {
|
||||
uint32_t acq_fen_fd_cnt;
|
||||
int *acq_fen_fd;
|
||||
int *rel_fen_fd;
|
||||
+ int *retire_fen_fd;
|
||||
};
|
||||
|
||||
struct mdp_buf_fence {
|
||||
--
|
||||
2.9.3
|
||||
@ -0,0 +1,673 @@
|
||||
From 587a8d5cfc2db51381303579b73854f06ef99d66 Mon Sep 17 00:00:00 2001
|
||||
From: Tad <tad@spotco.us>
|
||||
Date: Mon, 6 Nov 2017 19:01:08 -0500
|
||||
Subject: [PATCH] Remove CMStats
|
||||
|
||||
Change-Id: I073b062a3e71c33dab4379c7c60a016595579562
|
||||
---
|
||||
AndroidManifest.xml | 8 --
|
||||
res/xml/security_settings_cyanogenmod.xml | 30 -----
|
||||
src/com/android/settings/Settings.java | 1 -
|
||||
.../android/settings/cmstats/AnonymousStats.java | 127 ------------------
|
||||
src/com/android/settings/cmstats/PreviewData.java | 49 -------
|
||||
.../android/settings/cmstats/ReportingService.java | 149 ---------------------
|
||||
.../settings/cmstats/ReportingServiceManager.java | 113 ----------------
|
||||
src/com/android/settings/cmstats/Utilities.java | 99 --------------
|
||||
.../settings/cyanogenmod/PrivacySettings.java | 1 -
|
||||
9 files changed, 577 deletions(-)
|
||||
delete mode 100644 res/xml/security_settings_cyanogenmod.xml
|
||||
delete mode 100644 src/com/android/settings/cmstats/AnonymousStats.java
|
||||
delete mode 100644 src/com/android/settings/cmstats/PreviewData.java
|
||||
delete mode 100644 src/com/android/settings/cmstats/ReportingService.java
|
||||
delete mode 100644 src/com/android/settings/cmstats/ReportingServiceManager.java
|
||||
delete mode 100644 src/com/android/settings/cmstats/Utilities.java
|
||||
|
||||
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
|
||||
index 3f53b75d5..f0f89bec5 100644
|
||||
--- a/AndroidManifest.xml
|
||||
+++ b/AndroidManifest.xml
|
||||
@@ -1871,14 +1871,6 @@
|
||||
|
||||
<activity android:name=".ApnEditor" />
|
||||
|
||||
- <activity android:name="Settings$AnonymousStatsActivity"
|
||||
- android:label="@string/anonymous_statistics_title"
|
||||
- android:configChanges="orientation|keyboardHidden|screenSize"
|
||||
- android:clearTaskOnLaunch="true">
|
||||
- <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
|
||||
- android:value="com.android.settings.cmstats.AnonymousStats" />
|
||||
- </activity>
|
||||
-
|
||||
<activity android:name=".cyanogenmod.ChangeLog" />
|
||||
|
||||
<activity android:name=".cyanogenmod.ContributorsCloud" />
|
||||
diff --git a/res/xml/security_settings_cyanogenmod.xml b/res/xml/security_settings_cyanogenmod.xml
|
||||
deleted file mode 100644
|
||||
index 68aba9510..000000000
|
||||
--- a/res/xml/security_settings_cyanogenmod.xml
|
||||
+++ /dev/null
|
||||
@@ -1,30 +0,0 @@
|
||||
-<?xml version="1.0" encoding="utf-8"?>
|
||||
-<!-- Copyright (C) 2013 The CyanogenMod Project
|
||||
-
|
||||
- Licensed under the Apache License, Version 2.0 (the "License");
|
||||
- you may not use this file except in compliance with the License.
|
||||
- You may obtain a copy of the License at
|
||||
-
|
||||
- http://www.apache.org/licenses/LICENSE-2.0
|
||||
-
|
||||
- Unless required by applicable law or agreed to in writing, software
|
||||
- distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
- See the License for the specific language governing permissions and
|
||||
- limitations under the License.
|
||||
--->
|
||||
-
|
||||
-<PreferenceScreen
|
||||
- xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
-
|
||||
- <PreferenceCategory android:key="cmprivacy" android:title="@string/privacy_settings_cyanogenmod_category">
|
||||
- <!-- Anonymous statistics - (CMStats) -->
|
||||
- <PreferenceScreen
|
||||
- android:key="cmstats"
|
||||
- android:title="@string/anonymous_statistics_title"
|
||||
- android:summary="@string/anonymous_statistics_summary"
|
||||
- android:fragment="com.android.settings.cmstats.AnonymousStats" >
|
||||
- </PreferenceScreen>
|
||||
- </PreferenceCategory>
|
||||
-
|
||||
-</PreferenceScreen>
|
||||
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
|
||||
index 81b8cf65e..464258166 100644
|
||||
--- a/src/com/android/settings/Settings.java
|
||||
+++ b/src/com/android/settings/Settings.java
|
||||
@@ -1403,7 +1403,6 @@ public class Settings extends PreferenceActivity
|
||||
public static class PaymentSettingsActivity extends Settings { /* empty */ }
|
||||
public static class PrintSettingsActivity extends Settings { /* empty */ }
|
||||
public static class PrintJobSettingsActivity extends Settings { /* empty */ }
|
||||
- public static class AnonymousStatsActivity extends Settings { /* empty */ }
|
||||
public static class ApnSettingsActivity extends Settings { /* empty */ }
|
||||
public static class ApnEditorActivity extends Settings { /* empty */ }
|
||||
public static class BlacklistSettingsActivity extends Settings { /* empty */ }
|
||||
diff --git a/src/com/android/settings/cmstats/AnonymousStats.java b/src/com/android/settings/cmstats/AnonymousStats.java
|
||||
deleted file mode 100644
|
||||
index 2e6d016b7..000000000
|
||||
--- a/src/com/android/settings/cmstats/AnonymousStats.java
|
||||
+++ /dev/null
|
||||
@@ -1,127 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2012 The CyanogenMod Project
|
||||
- *
|
||||
- * Licensed under the Apache License, Version 2.0 (the "License");
|
||||
- * you may not use this file except in compliance with the License.
|
||||
- * You may obtain a copy of the License at
|
||||
- *
|
||||
- * http://www.apache.org/licenses/LICENSE-2.0
|
||||
- *
|
||||
- * Unless required by applicable law or agreed to in writing, software
|
||||
- * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
- * See the License for the specific language governing permissions and
|
||||
- * limitations under the License.
|
||||
- */
|
||||
-
|
||||
-package com.android.settings.cmstats;
|
||||
-
|
||||
-import android.app.AlertDialog;
|
||||
-import android.app.Dialog;
|
||||
-import android.content.Context;
|
||||
-import android.content.DialogInterface;
|
||||
-import android.content.Intent;
|
||||
-import android.content.SharedPreferences;
|
||||
-import android.net.Uri;
|
||||
-import android.os.Bundle;
|
||||
-import android.preference.CheckBoxPreference;
|
||||
-import android.preference.Preference;
|
||||
-import android.preference.PreferenceScreen;
|
||||
-
|
||||
-import android.provider.Settings;
|
||||
-import com.android.settings.R;
|
||||
-import com.android.settings.SettingsPreferenceFragment;
|
||||
-
|
||||
-public class AnonymousStats extends SettingsPreferenceFragment implements
|
||||
- DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
|
||||
- Preference.OnPreferenceChangeListener {
|
||||
- private static final String VIEW_STATS = "pref_view_stats";
|
||||
-
|
||||
- private static final String PREF_FILE_NAME = "CMStats";
|
||||
- /* package */ static final String ANONYMOUS_OPT_IN = "pref_anonymous_opt_in";
|
||||
- /* package */ static final String ANONYMOUS_LAST_CHECKED = "pref_anonymous_checked_in";
|
||||
-
|
||||
- private CheckBoxPreference mEnableReporting;
|
||||
- private Preference mViewStats;
|
||||
-
|
||||
- private Dialog mOkDialog;
|
||||
- private boolean mOkClicked;
|
||||
-
|
||||
- private SharedPreferences mPrefs;
|
||||
-
|
||||
- public static SharedPreferences getPreferences(Context context) {
|
||||
- return context.getSharedPreferences(PREF_FILE_NAME, 0);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void onCreate(Bundle savedInstanceState) {
|
||||
- super.onCreate(savedInstanceState);
|
||||
-
|
||||
- addPreferencesFromResource(R.xml.anonymous_stats);
|
||||
-
|
||||
- mPrefs = getPreferences(getActivity());
|
||||
-
|
||||
- PreferenceScreen prefSet = getPreferenceScreen();
|
||||
- mEnableReporting = (CheckBoxPreference) prefSet.findPreference(ANONYMOUS_OPT_IN);
|
||||
- mViewStats = (Preference) prefSet.findPreference(VIEW_STATS);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
|
||||
- if (preference == mEnableReporting) {
|
||||
- if (mEnableReporting.isChecked()) {
|
||||
- // Display the confirmation dialog
|
||||
- mOkClicked = false;
|
||||
- if (mOkDialog != null) {
|
||||
- mOkDialog.dismiss();
|
||||
- }
|
||||
- mOkDialog = new AlertDialog.Builder(getActivity())
|
||||
- .setMessage(R.string.anonymous_statistics_warning)
|
||||
- .setTitle(R.string.anonymous_statistics_warning_title)
|
||||
- .setIconAttribute(android.R.attr.alertDialogIcon)
|
||||
- .setPositiveButton(android.R.string.yes, this)
|
||||
- .setNeutralButton(R.string.anonymous_learn_more, this)
|
||||
- .setNegativeButton(android.R.string.no, this)
|
||||
- .show();
|
||||
- mOkDialog.setOnDismissListener(this);
|
||||
- } else {
|
||||
- // Disable reporting
|
||||
- Utilities.setStatsCollectionEnabled(getActivity(), false);
|
||||
- }
|
||||
- } else if (preference == mViewStats) {
|
||||
- // Display the stats page
|
||||
- Uri uri = Uri.parse("http://stats.cyanogenmod.org");
|
||||
- startActivity(new Intent(Intent.ACTION_VIEW, uri));
|
||||
- } else {
|
||||
- // If we didn't handle it, let preferences handle it.
|
||||
- return super.onPreferenceTreeClick(preferenceScreen, preference);
|
||||
- }
|
||||
- return true;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void onDismiss(DialogInterface dialog) {
|
||||
- if (!mOkClicked) {
|
||||
- mEnableReporting.setChecked(false);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void onClick(DialogInterface dialog, int which) {
|
||||
- if (which == DialogInterface.BUTTON_POSITIVE) {
|
||||
- mOkClicked = true;
|
||||
- Utilities.setStatsCollectionEnabled(getActivity(), true);
|
||||
- ReportingServiceManager.launchService(getActivity());
|
||||
- } else if (which == DialogInterface.BUTTON_NEGATIVE) {
|
||||
- mEnableReporting.setChecked(false);
|
||||
- } else {
|
||||
- Uri uri = Uri.parse("http://www.cyanogenmod.org/blog/cmstats-what-it-is-and-why-you-should-opt-in");
|
||||
- startActivity(new Intent(Intent.ACTION_VIEW, uri));
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/com/android/settings/cmstats/PreviewData.java b/src/com/android/settings/cmstats/PreviewData.java
|
||||
deleted file mode 100644
|
||||
index 7a78aea51..000000000
|
||||
--- a/src/com/android/settings/cmstats/PreviewData.java
|
||||
+++ /dev/null
|
||||
@@ -1,49 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2012 The CyanogenMod Project
|
||||
- *
|
||||
- * Licensed under the Apache License, Version 2.0 (the "License");
|
||||
- * you may not use this file except in compliance with the License.
|
||||
- * You may obtain a copy of the License at
|
||||
- *
|
||||
- * http://www.apache.org/licenses/LICENSE-2.0
|
||||
- *
|
||||
- * Unless required by applicable law or agreed to in writing, software
|
||||
- * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
- * See the License for the specific language governing permissions and
|
||||
- * limitations under the License.
|
||||
- */
|
||||
-
|
||||
-package com.android.settings.cmstats;
|
||||
-
|
||||
-import android.content.Context;
|
||||
-import android.os.Bundle;
|
||||
-import android.preference.Preference;
|
||||
-import android.preference.PreferenceScreen;
|
||||
-
|
||||
-import com.android.settings.R;
|
||||
-import com.android.settings.SettingsPreferenceFragment;
|
||||
-
|
||||
-public class PreviewData extends SettingsPreferenceFragment {
|
||||
- private static final String UNIQUE_ID = "preview_id";
|
||||
- private static final String DEVICE = "preview_device";
|
||||
- private static final String VERSION = "preview_version";
|
||||
- private static final String COUNTRY = "preview_country";
|
||||
- private static final String CARRIER = "preview_carrier";
|
||||
-
|
||||
- @Override
|
||||
- public void onCreate(Bundle savedInstanceState) {
|
||||
- super.onCreate(savedInstanceState);
|
||||
-
|
||||
- addPreferencesFromResource(R.xml.preview_data);
|
||||
-
|
||||
- final PreferenceScreen prefSet = getPreferenceScreen();
|
||||
- final Context context = getActivity();
|
||||
-
|
||||
- prefSet.findPreference(UNIQUE_ID).setSummary(Utilities.getUniqueID(context));
|
||||
- prefSet.findPreference(DEVICE).setSummary(Utilities.getDevice());
|
||||
- prefSet.findPreference(VERSION).setSummary(Utilities.getModVersion());
|
||||
- prefSet.findPreference(COUNTRY).setSummary(Utilities.getCountryCode(context));
|
||||
- prefSet.findPreference(CARRIER).setSummary(Utilities.getCarrier(context));
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/com/android/settings/cmstats/ReportingService.java b/src/com/android/settings/cmstats/ReportingService.java
|
||||
deleted file mode 100644
|
||||
index 32db82011..000000000
|
||||
--- a/src/com/android/settings/cmstats/ReportingService.java
|
||||
+++ /dev/null
|
||||
@@ -1,149 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2012 The CyanogenMod Project
|
||||
- *
|
||||
- * Licensed under the Apache License, Version 2.0 (the "License");
|
||||
- * you may not use this file except in compliance with the License.
|
||||
- * You may obtain a copy of the License at
|
||||
- *
|
||||
- * http://www.apache.org/licenses/LICENSE-2.0
|
||||
- *
|
||||
- * Unless required by applicable law or agreed to in writing, software
|
||||
- * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
- * See the License for the specific language governing permissions and
|
||||
- * limitations under the License.
|
||||
- */
|
||||
-
|
||||
-package com.android.settings.cmstats;
|
||||
-
|
||||
-import android.app.Service;
|
||||
-import android.content.Context;
|
||||
-import android.content.Intent;
|
||||
-import android.content.SharedPreferences;
|
||||
-import android.os.AsyncTask;
|
||||
-import android.os.IBinder;
|
||||
-import android.util.Log;
|
||||
-
|
||||
-import com.android.settings.R;
|
||||
-import com.android.settings.Settings;
|
||||
-
|
||||
-import com.google.analytics.tracking.android.GoogleAnalytics;
|
||||
-import com.google.analytics.tracking.android.Tracker;
|
||||
-
|
||||
-import org.apache.http.NameValuePair;
|
||||
-import org.apache.http.client.HttpClient;
|
||||
-import org.apache.http.client.entity.UrlEncodedFormEntity;
|
||||
-import org.apache.http.client.methods.HttpPost;
|
||||
-import org.apache.http.impl.client.DefaultHttpClient;
|
||||
-import org.apache.http.message.BasicNameValuePair;
|
||||
-
|
||||
-import java.io.IOException;
|
||||
-import java.util.ArrayList;
|
||||
-import java.util.List;
|
||||
-
|
||||
-public class ReportingService extends Service {
|
||||
- /* package */ static final String TAG = "CMStats";
|
||||
-
|
||||
- private StatsUploadTask mTask;
|
||||
-
|
||||
- @Override
|
||||
- public IBinder onBind(Intent intent) {
|
||||
- return null;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public int onStartCommand (Intent intent, int flags, int startId) {
|
||||
- Log.d(TAG, "User has opted in -- reporting.");
|
||||
-
|
||||
- if (mTask == null || mTask.getStatus() == AsyncTask.Status.FINISHED) {
|
||||
- mTask = new StatsUploadTask();
|
||||
- mTask.execute();
|
||||
- }
|
||||
-
|
||||
- return Service.START_REDELIVER_INTENT;
|
||||
- }
|
||||
-
|
||||
- private class StatsUploadTask extends AsyncTask<Void, Void, Boolean> {
|
||||
- @Override
|
||||
- protected Boolean doInBackground(Void... params) {
|
||||
- String deviceId = Utilities.getUniqueID(getApplicationContext());
|
||||
- String deviceName = Utilities.getDevice();
|
||||
- String deviceVersion = Utilities.getModVersion();
|
||||
- String deviceCountry = Utilities.getCountryCode(getApplicationContext());
|
||||
- String deviceCarrier = Utilities.getCarrier(getApplicationContext());
|
||||
- String deviceCarrierId = Utilities.getCarrierId(getApplicationContext());
|
||||
-
|
||||
- Log.d(TAG, "SERVICE: Device ID=" + deviceId);
|
||||
- Log.d(TAG, "SERVICE: Device Name=" + deviceName);
|
||||
- Log.d(TAG, "SERVICE: Device Version=" + deviceVersion);
|
||||
- Log.d(TAG, "SERVICE: Country=" + deviceCountry);
|
||||
- Log.d(TAG, "SERVICE: Carrier=" + deviceCarrier);
|
||||
- Log.d(TAG, "SERVICE: Carrier ID=" + deviceCarrierId);
|
||||
-
|
||||
- // report to google analytics
|
||||
- GoogleAnalytics ga = GoogleAnalytics.getInstance(ReportingService.this);
|
||||
- Tracker tracker = ga.getTracker(getString(R.string.ga_trackingId));
|
||||
- tracker.sendEvent(deviceName, deviceVersion, deviceCountry, null);
|
||||
-
|
||||
- // this really should be set at build time...
|
||||
- // format of version should be:
|
||||
- // version[-date-type]-device
|
||||
- String[] parts = deviceVersion.split("-");
|
||||
- String deviceVersionNoDevice = null;
|
||||
- if (parts.length == 2) {
|
||||
- deviceVersionNoDevice = parts[0];
|
||||
- } else if (parts.length == 4) {
|
||||
- deviceVersionNoDevice = parts[0] + "-" + parts[2];
|
||||
- }
|
||||
-
|
||||
- if (deviceVersionNoDevice != null) {
|
||||
- tracker.sendEvent("checkin", deviceName, deviceVersionNoDevice, null);
|
||||
- }
|
||||
- tracker.close();
|
||||
-
|
||||
- // report to the cmstats service
|
||||
- HttpClient httpClient = new DefaultHttpClient();
|
||||
- HttpPost httpPost = new HttpPost("https://stats.cyanogenmod.org/submit");
|
||||
- boolean success = false;
|
||||
-
|
||||
- try {
|
||||
- List<NameValuePair> kv = new ArrayList<NameValuePair>(5);
|
||||
- kv.add(new BasicNameValuePair("device_hash", deviceId));
|
||||
- kv.add(new BasicNameValuePair("device_name", deviceName));
|
||||
- kv.add(new BasicNameValuePair("device_version", deviceVersion));
|
||||
- kv.add(new BasicNameValuePair("device_country", deviceCountry));
|
||||
- kv.add(new BasicNameValuePair("device_carrier", deviceCarrier));
|
||||
- kv.add(new BasicNameValuePair("device_carrier_id", deviceCarrierId));
|
||||
-
|
||||
- httpPost.setEntity(new UrlEncodedFormEntity(kv));
|
||||
- httpClient.execute(httpPost);
|
||||
-
|
||||
- success = true;
|
||||
- } catch (IOException e) {
|
||||
- Log.w(TAG, "Could not upload stats checkin", e);
|
||||
- }
|
||||
-
|
||||
- return success;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- protected void onPostExecute(Boolean result) {
|
||||
- final Context context = ReportingService.this;
|
||||
- long interval;
|
||||
-
|
||||
- if (result) {
|
||||
- final SharedPreferences prefs = AnonymousStats.getPreferences(context);
|
||||
- prefs.edit().putLong(AnonymousStats.ANONYMOUS_LAST_CHECKED,
|
||||
- System.currentTimeMillis()).apply();
|
||||
- // use set interval
|
||||
- interval = 0;
|
||||
- } else {
|
||||
- // error, try again in 3 hours
|
||||
- interval = 3L * 60L * 60L * 1000L;
|
||||
- }
|
||||
-
|
||||
- ReportingServiceManager.setAlarm(context, interval);
|
||||
- stopSelf();
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/com/android/settings/cmstats/ReportingServiceManager.java b/src/com/android/settings/cmstats/ReportingServiceManager.java
|
||||
deleted file mode 100644
|
||||
index 540f55e4d..000000000
|
||||
--- a/src/com/android/settings/cmstats/ReportingServiceManager.java
|
||||
+++ /dev/null
|
||||
@@ -1,113 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2012 The CyanogenMod Project
|
||||
- *
|
||||
- * Licensed under the Apache License, Version 2.0 (the "License");
|
||||
- * you may not use this file except in compliance with the License.
|
||||
- * You may obtain a copy of the License at
|
||||
- *
|
||||
- * http://www.apache.org/licenses/LICENSE-2.0
|
||||
- *
|
||||
- * Unless required by applicable law or agreed to in writing, software
|
||||
- * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
- * See the License for the specific language governing permissions and
|
||||
- * limitations under the License.
|
||||
- */
|
||||
-
|
||||
-package com.android.settings.cmstats;
|
||||
-
|
||||
-import android.app.AlarmManager;
|
||||
-import android.app.PendingIntent;
|
||||
-import android.content.BroadcastReceiver;
|
||||
-import android.content.Context;
|
||||
-import android.content.Intent;
|
||||
-import android.content.SharedPreferences;
|
||||
-import android.net.ConnectivityManager;
|
||||
-import android.net.NetworkInfo;
|
||||
-import android.provider.Settings;
|
||||
-import android.util.Log;
|
||||
-
|
||||
-public class ReportingServiceManager extends BroadcastReceiver {
|
||||
- private static final long MILLIS_PER_HOUR = 60L * 60L * 1000L;
|
||||
- private static final long MILLIS_PER_DAY = 24L * MILLIS_PER_HOUR;
|
||||
- private static final long UPDATE_INTERVAL = 1L * MILLIS_PER_DAY;
|
||||
-
|
||||
- @Override
|
||||
- public void onReceive(Context context, Intent intent) {
|
||||
- if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
|
||||
- setAlarm(context, 0);
|
||||
- } else {
|
||||
- launchService(context);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- public static void setAlarm(Context context, long millisFromNow) {
|
||||
- SharedPreferences prefs = AnonymousStats.getPreferences(context);
|
||||
- if (prefs.contains(AnonymousStats.ANONYMOUS_OPT_IN)) {
|
||||
- migrate(context, prefs);
|
||||
- }
|
||||
- if (!Utilities.isStatsCollectionEnabled(context)) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (millisFromNow <= 0) {
|
||||
- long lastSynced = prefs.getLong(AnonymousStats.ANONYMOUS_LAST_CHECKED, 0);
|
||||
- if (lastSynced == 0) {
|
||||
- // never synced, so let's fake out that the last sync was just now.
|
||||
- // this will allow the user tFrame time to opt out before it will start
|
||||
- // sending up anonymous stats.
|
||||
- lastSynced = System.currentTimeMillis();
|
||||
- prefs.edit().putLong(AnonymousStats.ANONYMOUS_LAST_CHECKED, lastSynced).apply();
|
||||
- Log.d(ReportingService.TAG, "Set alarm for first sync.");
|
||||
- }
|
||||
- millisFromNow = (lastSynced + UPDATE_INTERVAL) - System.currentTimeMillis();
|
||||
- }
|
||||
-
|
||||
- Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);
|
||||
- intent.setClass(context, ReportingServiceManager.class);
|
||||
-
|
||||
- AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
|
||||
- alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + millisFromNow,
|
||||
- PendingIntent.getBroadcast(context, 0, intent, 0));
|
||||
- Log.d(ReportingService.TAG, "Next sync attempt in : " + millisFromNow / MILLIS_PER_HOUR + " hours");
|
||||
- }
|
||||
-
|
||||
- public static void launchService(Context context) {
|
||||
- ConnectivityManager cm = (ConnectivityManager)
|
||||
- context.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
-
|
||||
- NetworkInfo networkInfo = cm.getActiveNetworkInfo();
|
||||
- if (networkInfo == null || !networkInfo.isConnected()) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- SharedPreferences prefs = AnonymousStats.getPreferences(context);
|
||||
-
|
||||
- if (!Utilities.isStatsCollectionEnabled(context)) {
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- long lastSynced = prefs.getLong(AnonymousStats.ANONYMOUS_LAST_CHECKED, 0);
|
||||
- if (lastSynced == 0) {
|
||||
- setAlarm(context, 0);
|
||||
- return;
|
||||
- }
|
||||
- long timeElapsed = System.currentTimeMillis() - lastSynced;
|
||||
- if (timeElapsed < UPDATE_INTERVAL) {
|
||||
- long timeLeft = UPDATE_INTERVAL - timeElapsed;
|
||||
- Log.d(ReportingService.TAG, "Waiting for next sync : " + timeLeft / MILLIS_PER_HOUR + " hours");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- Intent intent = new Intent();
|
||||
- intent.setClass(context, ReportingService.class);
|
||||
- context.startService(intent);
|
||||
- }
|
||||
-
|
||||
- private static void migrate(Context context, SharedPreferences prefs) {
|
||||
- Utilities.setStatsCollectionEnabled(context,
|
||||
- prefs.getBoolean(AnonymousStats.ANONYMOUS_OPT_IN, true));
|
||||
- prefs.edit().remove(AnonymousStats.ANONYMOUS_OPT_IN).commit();
|
||||
- }
|
||||
-
|
||||
-}
|
||||
diff --git a/src/com/android/settings/cmstats/Utilities.java b/src/com/android/settings/cmstats/Utilities.java
|
||||
deleted file mode 100644
|
||||
index 4d4ff48fa..000000000
|
||||
--- a/src/com/android/settings/cmstats/Utilities.java
|
||||
+++ /dev/null
|
||||
@@ -1,99 +0,0 @@
|
||||
-/*
|
||||
- * Copyright (C) 2012 The CyanogenMod Project
|
||||
- *
|
||||
- * Licensed under the Apache License, Version 2.0 (the "License");
|
||||
- * you may not use this file except in compliance with the License.
|
||||
- * You may obtain a copy of the License at
|
||||
- *
|
||||
- * http://www.apache.org/licenses/LICENSE-2.0
|
||||
- *
|
||||
- * Unless required by applicable law or agreed to in writing, software
|
||||
- * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
- * See the License for the specific language governing permissions and
|
||||
- * limitations under the License.
|
||||
- */
|
||||
-
|
||||
-package com.android.settings.cmstats;
|
||||
-
|
||||
-import android.content.Context;
|
||||
-import android.os.SystemProperties;
|
||||
-import android.provider.Settings;
|
||||
-import android.telephony.TelephonyManager;
|
||||
-import android.text.TextUtils;
|
||||
-
|
||||
-import java.math.BigInteger;
|
||||
-import java.net.NetworkInterface;
|
||||
-import java.security.MessageDigest;
|
||||
-
|
||||
-public class Utilities {
|
||||
- public static String getUniqueID(Context context) {
|
||||
- final String id = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
|
||||
- return digest(context.getPackageName() + id);
|
||||
- }
|
||||
-
|
||||
- public static String getCarrier(Context context) {
|
||||
- TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
- String carrier = tm.getNetworkOperatorName();
|
||||
- if (TextUtils.isEmpty(carrier)) {
|
||||
- carrier = "Unknown";
|
||||
- }
|
||||
- return carrier;
|
||||
- }
|
||||
-
|
||||
- public static String getCarrierId(Context context) {
|
||||
- TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
- String carrierId = tm.getNetworkOperator();
|
||||
- if (TextUtils.isEmpty(carrierId)) {
|
||||
- carrierId = "0";
|
||||
- }
|
||||
- return carrierId;
|
||||
- }
|
||||
-
|
||||
- public static String getCountryCode(Context context) {
|
||||
- TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
|
||||
- String countryCode = tm.getNetworkCountryIso();
|
||||
- if (TextUtils.isEmpty(countryCode)) {
|
||||
- countryCode = "Unknown";
|
||||
- }
|
||||
- return countryCode;
|
||||
- }
|
||||
-
|
||||
- public static String getDevice() {
|
||||
- return SystemProperties.get("ro.cm.device");
|
||||
- }
|
||||
-
|
||||
- public static String getModVersion() {
|
||||
- return SystemProperties.get("ro.cm.version");
|
||||
- }
|
||||
-
|
||||
- public static String digest(String input) {
|
||||
- try {
|
||||
- MessageDigest md = MessageDigest.getInstance("MD5");
|
||||
- return new BigInteger(1, md.digest(input.getBytes())).toString(16).toUpperCase();
|
||||
- } catch (Exception e) {
|
||||
- return null;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Check to see if global stats are enabled.
|
||||
- * @param context
|
||||
- * @return Whether or not stats collection is enabled.
|
||||
- */
|
||||
- public static boolean isStatsCollectionEnabled(Context context) {
|
||||
- return Settings.System.getInt(context.getContentResolver(),
|
||||
- Settings.System.STATS_COLLECTION, 1) != 0;
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * Enabled or disable stats collection
|
||||
- * @param context
|
||||
- * @param enabled Boolean that sets collection being enabled.
|
||||
- */
|
||||
- public static void setStatsCollectionEnabled(Context context, boolean enabled) {
|
||||
- int enable = (enabled) ? 1 : 0;
|
||||
- Settings.System.putInt(context.getContentResolver(),
|
||||
- Settings.System.STATS_COLLECTION, enable);
|
||||
- }
|
||||
-}
|
||||
diff --git a/src/com/android/settings/cyanogenmod/PrivacySettings.java b/src/com/android/settings/cyanogenmod/PrivacySettings.java
|
||||
index 49bc7b497..6c6021f76 100644
|
||||
--- a/src/com/android/settings/cyanogenmod/PrivacySettings.java
|
||||
+++ b/src/com/android/settings/cyanogenmod/PrivacySettings.java
|
||||
@@ -54,7 +54,6 @@ public class PrivacySettings extends SettingsPreferenceFragment {
|
||||
mBlacklist = null;
|
||||
}
|
||||
|
||||
- addPreferencesFromResource(R.xml.security_settings_cyanogenmod);
|
||||
}
|
||||
|
||||
@Override
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
#!/bin/bash
|
||||
cd "$DOS_BUILD_BASE""kernel/asus/grouper"
|
||||
git apply $DOS_PATCHES_LINUX_CVES/0014-GCC_Patches/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6689/^3.5/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6701/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6704/^3.5/0001.patch
|
||||
@ -70,5 +71,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/ANY/0003.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
|
||||
editKernelLocalversion "-dos.p70"
|
||||
editKernelLocalversion "-dos.p71"
|
||||
cd "$DOS_BUILD_BASE"
|
||||
|
||||
@ -0,0 +1,136 @@
|
||||
#!/bin/bash
|
||||
cd "$DOS_BUILD_BASE""kernel/zte/msm8930"
|
||||
git apply $DOS_PATCHES_LINUX_CVES/0012-Copperhead-Deny_USB/3.4/3.4-Backport.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/0013-syskaller-Misc/ANY/0008.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/0014-GCC_Patches/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6657/^3.5/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6701/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6703/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6703/ANY/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6704/^3.5/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2015/^3.8/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0196/3.4/0003.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1739/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2523/^3.13/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/ANY/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/ANY/0004.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4323/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4655/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-4656/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7822/3.2-^3.16/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7970/3.4/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-8709/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9420/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9683/^3.18/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9715/^3.14/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9870/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9888/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1420/3.2-^3.19/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1593/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1805/3.4/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2041/^3.19/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2686/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2922/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-3636/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7550/^4.3/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8215/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8937/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8939/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8944/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0723/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0774/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0004.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0006.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0007.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0010.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0821/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10233/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2384/^4.5/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2438/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2544/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2545/^4.4/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2546/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2549/^4.4/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3134/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3138/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3854/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3865/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3894/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4569/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4578/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4578/ANY/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4805/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5829/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6728/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6753/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6791/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6828/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7910/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7915/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8399/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8406/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8463/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8650/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9576/3.4/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9604/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9793/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9794/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0403/3.0-^3.18/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0404/^3.18/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0524/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0611/3.4/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0710/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0751/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000251/3.4/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000380/^4.11/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11015/prima/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11015/prima/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11089/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/3.2-^3.16/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080/ANY/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080-Extra/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080-Extra/ANY/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080-Extra/ANY/0003.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080-Extra/ANY/0004.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13215/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15265/^4.14/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/^4.13/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16535/^4.13/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-2671/^4.10/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6074/^4.9/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6951/^3.14/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/ANY/0003.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.4/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0002.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
|
||||
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
|
||||
editKernelLocalversion "-dos.p132"
|
||||
cd "$DOS_BUILD_BASE"
|
||||
@ -18,7 +18,7 @@
|
||||
#Last verified: 2018-04-27
|
||||
|
||||
patchAllKernels() {
|
||||
startPatcher "kernel_asus_grouper";
|
||||
startPatcher "kernel_asus_grouper kernel_zte_msm8930";
|
||||
}
|
||||
export -f patchAllKernels;
|
||||
|
||||
@ -28,7 +28,7 @@ resetWorkspace() {
|
||||
export -f resetWorkspace;
|
||||
|
||||
scanWorkspaceForMalware() {
|
||||
scanQueue="$DOS_BUILD_BASE/abi $DOS_BUILD_BASE/android $DOS_BUILD_BASE/art $DOS_BUILD_BASE/bionic $DOS_BUILD_BASE/bootable $DOS_BUILD_BASE/build $DOS_BUILD_BASE/dalvik $DOS_BUILD_BASE/device $DOS_BUILD_BASE/hardware $DOS_BUILD_BASE/libcore $DOS_BUILD_BASE/libnativehelper $DOS_BUILD_BASE/ndk $DOS_BUILD_BASE/packages $DOS_BUILD_BASE/pdk $DOS_BUILD_BASE/platform_testing $DOS_BUILD_BASE/sdk $DOS_BUILD_BASE/system";
|
||||
scanQueue="$DOS_BUILD_BASE/abi $DOS_BUILD_BASE/android $DOS_BUILD_BASE/bionic $DOS_BUILD_BASE/bootable $DOS_BUILD_BASE/build $DOS_BUILD_BASE/dalvik $DOS_BUILD_BASE/device $DOS_BUILD_BASE/hardware $DOS_BUILD_BASE/libcore $DOS_BUILD_BASE/libnativehelper $DOS_BUILD_BASE/ndk $DOS_BUILD_BASE/packages $DOS_BUILD_BASE/pdk $DOS_BUILD_BASE/sdk $DOS_BUILD_BASE/system";
|
||||
scanQueue=$scanQueue" $DOS_BUILD_BASE/vendor/cm $DOS_BUILD_BASE/vendor/cmsdk";
|
||||
scanForMalware true $scanQueue;
|
||||
}
|
||||
@ -50,7 +50,7 @@ buildAll() {
|
||||
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
|
||||
#Select devices are userdebug due to SELinux policy issues
|
||||
brunch aosp_grouper-user;
|
||||
brunch cm_nex-userdebug;
|
||||
brunch lineage_nex-userdebug;
|
||||
}
|
||||
export -f buildAll;
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
#You should have received a copy of the GNU General Public License
|
||||
#along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
#Last verified: 2018-04-27
|
||||
#Last verified:
|
||||
|
||||
#Initialize aliases
|
||||
#source ../../Scripts/init.sh
|
||||
@ -65,7 +65,7 @@ enterAndClear "bootable/recovery";
|
||||
|
||||
enterAndClear "build";
|
||||
#patch -p1 < "$DOS_PATCHES/android_build/0001-Automated_Build_Signing.patch"; #Automated build signing (CopperheadOS-13.0) #TODO
|
||||
sed -i 's/Mms/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence
|
||||
#sed -i 's/Mms/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence
|
||||
sed -i 's/ro.secure=0/ro.secure=1/' core/main.mk;
|
||||
#sed -i 's/ro.adb.secure=0/ro.adb.secure=1/' core/main.mk;
|
||||
|
||||
@ -73,8 +73,8 @@ enterAndClear "external/sqlite";
|
||||
#patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0) #TODO
|
||||
|
||||
enterAndClear "frameworks/base";
|
||||
sed -i 's/com.android.mms/org.smssecure.smssecure/' core/res/res/values/config.xml; #Change default SMS app to Silence
|
||||
sed -i 's|db_default_journal_mode" translatable="false">PERSIST|db_default_journal_mode" translatable="false">TRUNCATE|' core/res/res/values/config.xml; #Mirror SQLite secure_delete
|
||||
#sed -i 's/com.android.mms/org.smssecure.smssecure/' core/res/res/values/config.xml; #Change default SMS app to Silence
|
||||
sed -i 's|db_default_journal_mode">PERSIST|db_default_journal_mode">TRUNCATE|' core/res/res/values/config.xml; #Mirror SQLite secure_delete
|
||||
#if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then patch -p1 < "$DOS_PATCHES/android_frameworks_base/0003-Signature_Spoofing.patch"; fi; #Allow packages to spoof their signature (microG) #TODO
|
||||
#if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then patch -p1 < "$DOS_PATCHES/android_frameworks_base/0005-Harden_Sig_Spoofing.patch"; fi; #Restrict signature spoofing to system apps signed with the platform key #TODO
|
||||
if [ "$DOS_MICROG_INCLUDED" = "NLP" ]; then sed -i '/<item>com.android.location.fused<\/item>/a \ \ \ \ \ \ \ \ <item>org.microg.nlp</item>' core/res/res/values/config.xml; fi; #Add UnifiedNLP to location providers
|
||||
@ -116,11 +116,12 @@ fi;
|
||||
enterAndClear "packages/apps/Settings";
|
||||
sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/ChooseLockPassword.java; #Increase max password length
|
||||
if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/PrivacySettings.java; fi; #microG doesn't support Backup, hide the options
|
||||
#patch -p1 < "$DOS_PATCHES/android_packages_apps_Settings/0001-CMStats.patch"; #Remove CMStats #TOOD
|
||||
|
||||
|
||||
enterAndClear "packages/apps/Trebuchet";
|
||||
#cp -r "$DOS_PATCHES_COMMON/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; #TODO
|
||||
sed -i 's/req.touchEnabled = touchEnabled;/req.touchEnabled = true;/' src/com/android/launcher3/WallpaperCropActivity.java; #Allow scrolling
|
||||
sed -i 's/mCropView.setTouchEnabled(req.touchEnabled);/mCropView.setTouchEnabled(true);/' src/com/android/launcher3/WallpaperCropActivity.java;
|
||||
sed -i 's/mCropView.setTouchEnabled(touchEnabled);/mCropView.setTouchEnabled(true);/' WallpaperPicker/src/com/android/launcher3/WallpaperCropActivity.java;
|
||||
|
||||
enterAndClear "packages/inputmethods/LatinIME";
|
||||
#patch -p1 < "$DOS_PATCHES_COMMON/android_packages_inputmethods_LatinIME/0001-Voice.patch"; #Remove voice input key #TODO
|
||||
@ -131,7 +132,7 @@ if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/h
|
||||
|
||||
enterAndClear "vendor/cm";
|
||||
awk -i inplace '!/50-cm.sh/' config/common.mk; #Make sure our hosts is always used
|
||||
sed -i '3iinclude vendor/cm/config/sce.mk' config/common.mk; #Include extra apps
|
||||
#sed -i '3iinclude vendor/cm/config/sce.mk' config/common.mk; #Include extra apps #TODO
|
||||
if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
|
||||
awk -i inplace '!/DSPManager/' config/common.mk;
|
||||
fi;
|
||||
@ -143,7 +144,7 @@ if [ "$DOS_MICROG_INCLUDED" != "NONE" ]; then cp "$DOS_PATCHES_COMMON/android_ve
|
||||
if [ "$DOS_MICROG_INCLUDED" != "NONE" ]; then echo "include vendor/cm/config/sce-UnifiedNLP-Backends.mk" >> config/sce.mk; fi;
|
||||
sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype
|
||||
if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/CM_BUILDTYPE := dos/CM_BUILDTYPE := dosNC/' config/common.mk; fi;
|
||||
sed -i 's/Mms/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence
|
||||
#sed -i 's/Mms/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence
|
||||
#
|
||||
#END OF ROM CHANGES
|
||||
#
|
||||
@ -152,6 +153,18 @@ sed -i 's/Mms/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Si
|
||||
#START OF DEVICE CHANGES
|
||||
#
|
||||
|
||||
enterAndClear "device/zte/nex"
|
||||
patch -p1 < "$DOS_PATCHES/android_device_zte_nex/0001-Fixes.patch"; #Build fixes
|
||||
patch -p1 < "$DOS_PATCHES/android_device_zte_nex/0002-Lower_DPI.patch";
|
||||
mv cm.mk lineage.mk;
|
||||
sed -i 's/cm_/lineage_/' lineage.mk vendorsetup.sh;
|
||||
#In nex-vendor-blobs.mk
|
||||
# "system/lib/libtime_genoff.so" -> "obj/lib/libtime_genoff.so"
|
||||
# Remove "WCNSS_qcom_wlan_nv_2.bin"
|
||||
|
||||
enter "kernel/zte/msm8930"
|
||||
patch -p1 < $patches"android_kernel_zte_msm8930/0001-MDP-Fix.patch";
|
||||
|
||||
#Make changes to all devices
|
||||
cd "$DOS_BUILD_BASE";
|
||||
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0"' {} \;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user