invisiblek

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 8775282..38942f0 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -1318,11 +1318,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
     @Override
     public void
     getHardwareConfig (Message result) {
-        RILRequest rr = RILRequest.obtain(RIL_REQUEST_GET_HARDWARE_CONFIG, result);
-

invisiblek

On branch snd
Your branch is ahead of 'github/cm-12.0' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit f0989df.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

invisiblek

21:02 <+desterly> fucking caf always seems like a good idea yet somehow, shit never works right after.. heh
21:03 <@invisiblek> well
21:03 <@invisiblek> if oems just used the caf spec
21:03 <@invisiblek> and didnt fuck around
21:03 <@invisiblek> life would be MUCH easier
21:04 <+desterly> caf is like slipping it in the wife/gf's ass
21:04 <@invisiblek> lol
21:04 <@invisiblek> "it feels really good at first, but eventually you realize you're just getting shit everywhere"
21:04 <+desterly> always seems like a great idea.... but yet once it's there.... your just not sure it's worth it
21:04 <@invisiblek> lol

invisiblek

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 041d21b..4e5993d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -5212,9 +5212,7 @@ public class Launcher extends Activity
     }
 
     public boolean isRotationEnabled() {
-        boolean enableRotation = sForceEnableRotation ||
-                getResources().getBoolean(R.bool.allow_rotation);

invisiblek

diff --git a/Android.mk b/Android.mk
index b272445..b219493 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,10 @@ LOCAL_PATH:= $(call my-dir)
 # Build the Telecom service.
 include $(CLEAR_VARS)
 
-LOCAL_JAVA_LIBRARIES := telephony-common
+LOCAL_JAVA_LIBRARIES := \

invisiblek

<?xml version="1.0" encoding="UTF-8"?>
<manifest>
  <remote fetch="ssh://[email protected]:22123" name="gitlab" />
  <remote fetch="git://codeaurora.org/quic/la/" name="caf" />

  <project name="CyanogenMod/hudson" path="hudson" revision="master" />

  <!-- vendor repos -->
  <project name="TheMuppets/proprietary_vendor_samsung" path="vendor/samsung" />
  <project name="TheMuppets/proprietary_vendor_lge" path="vendor/lge" />

invisiblek

diff --git a/camera/CameraWrapper.cpp b/camera/CameraWrapper.cpp
index df05b68..3d7ac20 100644
--- a/camera/CameraWrapper.cpp
+++ b/camera/CameraWrapper.cpp
@@ -131,7 +131,7 @@ char * camera_fixup_setparams(struct camera_device * device, const char * settin
     bool isVideo = false;
     if (recordingHint)
         isVideo = !strcmp(recordingHint, "true");
-
+ALOGD("scene-mode: %s", params.get(android::CameraParameters::KEY_SCENE_MODE));

invisiblek

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 16b58a0..923e6d4 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1926,7 +1926,10 @@ static int singlemount(struct mntent *mp, int ignore_busy)
 				break;
 			mp->mnt_type = next + 1;
 		}
+		if (rc !=0 && mp->mnt_type)
+			goto attempt_auto_filesystem;

invisiblek

assert(getprop("ro.product.device") == "htc_m8" || getprop("ro.build.product") == "htc_m8" || getprop("ro.product.device") == "htc_m8whl" || getprop("ro.build.product") == "htc_m8whl" || getprop("ro.product.device") == "htc_m8wl" || getprop("ro.build.product") == "htc_m8wl" || getprop("ro.product.device") == "m8" || getprop("ro.build.product") == "m8" || getprop("ro.product.device") == "m8wl" || getprop("ro.build.product") == "m8wl" || getprop("ro.product.device") == "m8wlv" || getprop("ro.build.product") == "m8wlv" || getprop("ro.product.device") == "m8vzw" || getprop("ro.build.product") == "m8vzw" || getprop("ro.product.device") == "m8whl" || getprop("ro.build.product") == "m8whl" || getprop("ro.product.device") == "m8spr" || getprop("ro.build.product") == "m8spr" || abort("This package is for device: htc_m8,htc_m8whl,htc_m8wl,m8,m8wl,m8wlv,m8vzw,m8whl,m8spr; this device is " + getprop("ro.product.device") + "."););
assert(getprop("ro.bootloader") == "3.18.0.0000" || getprop("ro.bootloader") == "3.19.0.0000

invisiblek

1
118189
erase 2,0,262144
new 28,0,32770,32833,32835,33347,65535,65536,65538,98304,98306,98369,98371,98883,131071,131072,131074,163840,163842,163905,163907,164419,185442,196608,196610,229376,229378,229441,229443