Merge QPR1.180718.001

Conflicts:
	core/java/android/provider/Settings.java
	core/jni/android_view_InputEventReceiver.cpp
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
	media/jni/Android.bp
	packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
	packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java
	packages/SystemUI/res/layout/status_bar_mobile_signal_group.xml
	packages/SystemUI/res/values/config.xml
	packages/SystemUI/src/com/android/keyguard/KeyguardConstants.java
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarMobileView.java
	services/core/java/com/android/server/ConnectivityService.java
	services/core/java/com/android/server/NetworkTimeUpdateService.java
	services/core/java/com/android/server/StorageManagerService.java
	services/core/java/com/android/server/Watchdog.java
	services/core/java/com/android/server/am/ActiveServices.java
	services/core/java/com/android/server/am/ActivityManagerService.java
	services/core/java/com/android/server/am/ActivityStack.java
	services/core/java/com/android/server/am/AppTaskImpl.java
	services/core/java/com/android/server/audio/AudioService.java
	services/core/java/com/android/server/wm/DisplayContent.java
	services/tests/uiservicestests/src/com/android/server/notification/NotificationRecordTest.java
	telephony/java/android/telephony/CarrierConfigManager.java
	telephony/java/android/telephony/ims/ImsReasonInfo.java
	telephony/java/android/telephony/ims/feature/MmTelFeature.java
	telephony/java/com/android/internal/telephony/ISmsBaseImpl.java

Change-Id: I3f98340699f9e31be03eaf23fdea70803c4cef42

1 files changed, 0 insertions, 68 deletions

diff --git a/libs/hwui/ProgramCache.h b/libs/hwui/ProgramCache.h
deleted file mode 100644
index 488a4994ba95..000000000000
--- a/libs/hwui/ProgramCache.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source 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.
- */
-
-#ifndef ANDROID_HWUI_PROGRAM_CACHE_H
-#define ANDROID_HWUI_PROGRAM_CACHE_H
-
-#include <utils/KeyedVector.h>
-#include <utils/Log.h>
-#include <utils/String8.h>
-#include <map>
-
-#include <GLES2/gl2.h>
-
-#include "Debug.h"
-#include "Program.h"
-
-namespace android {
-namespace uirenderer {
-
-///////////////////////////////////////////////////////////////////////////////
-// Cache
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- * Generates and caches program. Programs are generated based on
- * ProgramDescriptions.
- */
-class ProgramCache {
-public:
-    explicit ProgramCache(const Extensions& extensions);
-    ~ProgramCache();
-
-    Program* get(const ProgramDescription& description);
-
-    void clear();
-
-private:
-    Program* generateProgram(const ProgramDescription& description, programid key);
-    String8 generateVertexShader(const ProgramDescription& description);
-    String8 generateFragmentShader(const ProgramDescription& description);
-    void generateBlend(String8& shader, const char* name, SkBlendMode mode);
-    void generateTextureWrap(String8& shader, GLenum wrapS, GLenum wrapT);
-
-    void printLongString(const String8& shader) const;
-
-    std::map<programid, std::unique_ptr<Program>> mCache;
-
-    const bool mHasES3;
-    const bool mHasLinearBlending;
-};  // class ProgramCache
-
-};  // namespace uirenderer
-};  // namespace android
-
-#endif  // ANDROID_HWUI_PROGRAM_CACHE_H