[kisler]

 Cita: Originalmente Escrito por David_Vaz

Voy a explicarme bien..

En SOURCE/frameworks/base

Puse este comando:

git remote add -f TM https://github.com/PurityROM/platform_frameworks_base && git cherry-pick 4214ff05fcf76d22bde4141a8a77a13f16237dc6

Esperé a que lo hiciese.. 3 horas, bien.

Puse a compilar..

Y salió el error que puse más arriba.. que es este:

frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
  ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: illegal start of expression
<<<<<<< HEAD
    ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:173: > expected
<<<<<<< HEAD
            ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
    ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:174: illegal start of expression
=======
      ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
   ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
      ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
             ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
               ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
                   ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
                       ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
                              ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
                               ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:181: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
                                   ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
  ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: illegal start of expression
<<<<<<< HEAD
    ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:627: > expected
<<<<<<< HEAD
            ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
    ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:628: illegal start of expression
=======
      ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
   ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: illegal start of expression
>>>>>>> 4214ff0... Yeah! TM is back!
      ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
             ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
               ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
                   ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
                       ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
                              ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: not a statement
>>>>>>> 4214ff0... Yeah! TM is back!
                               ^
frameworks/base/services/java/com/android/server/UiModeManagerService.java:630: ';' expected
>>>>>>> 4214ff0... Yeah! TM is back!
                                   ^

Lo que intento añadir es esto: https://github.com/PurityROM/platfor...77a13f16237dc6

Has abierto el archivo? Porque si lo abres y vas a esas lineas me juego que hay expresiones como head y yeah noseke que con eso no puede compilar