API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Oct 26th, 2017
538
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 26.60 KB | None | 0 0
raw download clone embed print report
  1.  
  2.  
  3. ===============================
  4. == Merging frameworks/base ==
  5. ===============================
  6.  
  7. remote: Counting objects: 647, done.
  8. remote: Compressing objects: 100% (5/5), done.
  9. remote: Total 647 (delta 386), reused 385 (delta 385), pack-reused 257
  10. Receiving objects: 100% (647/647), 603.99 KiB | 1.11 MiB/s, done.
  11. Resolving deltas: 100% (412/412), completed with 137 local objects.
  12. From https://github.com/LineageOMS/android_frameworks_base
  13. * branch cm-14.1 -> FETCH_HEAD
  14. HEAD is now at 0eb85c8eb41 Automatic translation import
  15. [detached HEAD 2d063153c33] OMS7-N: Support tagging resources as OK to overlay [1/11]
  16. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  17. Date: Tue Dec 15 16:08:31 2015 +0100
  18. 7 files changed, 164 insertions(+), 15 deletions(-)
  19. [detached HEAD 20b8d4241be] OMS7-N: Introduce the OverlayManagerService [2/11]
  20. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  21. Date: Tue Dec 15 16:40:23 2015 +0100
  22. 14 files changed, 2882 insertions(+)
  23. create mode 100644 core/java/android/content/om/IOverlayManager.aidl
  24. create mode 100644 core/java/android/content/om/OverlayInfo.aidl
  25. create mode 100644 core/java/android/content/om/OverlayInfo.java
  26. create mode 100644 services/core/java/com/android/server/om/IdmapManager.java
  27. create mode 100644 services/core/java/com/android/server/om/OverlayManagerService.java
  28. create mode 100644 services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
  29. create mode 100644 services/core/java/com/android/server/om/OverlayManagerSettings.java
  30. create mode 100644 services/core/java/com/android/server/om/OverlayManagerShellCommand.java
  31. [detached HEAD dbc555ae3da] OMS7-N: Integrate OverlayManagerService into framework [3/11]
  32. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  33. Date: Thu Jun 2 09:35:31 2016 +0200
  34. 21 files changed, 338 insertions(+), 475 deletions(-)
  35. [detached HEAD 4953ebb9dd0] OMS7-N: Set EXTRA_REPLACING correctly in ACTION_PACKAGE_ADDED [4/11]
  36. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  37. Date: Mon Apr 25 16:29:22 2016 +0200
  38. 1 file changed, 1 insertion(+)
  39. [detached HEAD 4d8ca269942] OMS7-N: idmap: suppress print for padded resources [5/11]
  40. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  41. Date: Mon Feb 29 14:12:35 2016 +0100
  42. 1 file changed, 3 insertions(+), 1 deletion(-)
  43. [detached HEAD 546fc9d2103] OMS7-N: Fix memory leak during idmap creation [6/11]
  44. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  45. Date: Thu Jun 2 09:34:36 2016 +0200
  46. 1 file changed, 25 insertions(+), 13 deletions(-)
  47. [detached HEAD 40b8fb9ea59] OMS7-N: installd: add command 'rmidmap' [7/11]
  48. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  49. Date: Thu Jun 2 09:35:09 2016 +0200
  50. 1 file changed, 7 insertions(+)
  51. [detached HEAD 1092c6713c7] OMS7-N: Disable Zygote preloaded drawables [8/11]
  52. Author: Josh Guilfoyle <Josh.Guilfoyle@T-Mobile.com>
  53. Date: Wed Jan 26 23:28:43 2011 -0800
  54. 1 file changed, 3 insertions(+), 1 deletion(-)
  55. [detached HEAD e3928ffd8a7] OMS7-N: Persistence on boot through OverlayManagerServiceImpl [9/11]
  56. Author: Nicholas Chum <nicholaschum@gmail.com>
  57. Date: Sun Jun 19 10:37:13 2016 -0400
  58. 1 file changed, 21 insertions(+), 10 deletions(-)
  59. [detached HEAD 5ddb2ecfd01] OMS7-N: Do not enforce code policy limiting overlay installation [10/11]
  60. Author: Nicholas Chum <nicholaschum@gmail.com>
  61. Date: Thu Oct 27 07:08:00 2016 +0200
  62. 1 file changed, 4 deletions(-)
  63. [detached HEAD a43e3fb2c37] OMS7-N: Implement multi-target enable/disable and disable-all [11/11]
  64. Author: Jacob McSwain <jacob.a.mcswain@gmail.com>
  65. Date: Sun Jun 26 15:21:52 2016 -0500
  66. 5 files changed, 161 insertions(+), 44 deletions(-)
  67. [detached HEAD e5eac9730fd] N-Extras: Add dynamic theme BootAnimation support
  68. Author: 0xD34D <clark@scheffsblend.com>
  69. Date: Mon Jun 20 22:59:48 2016 +0300
  70. 1 file changed, 4 insertions(+)
  71. [detached HEAD 1f534540b52] N-Extras: Add dynamic theme fonts support
  72. Author: 0xD34D <clark@scheffsblend.com>
  73. Date: Wed Jun 22 23:54:23 2016 +0300
  74. 8 files changed, 240 insertions(+), 27 deletions(-)
  75. [detached HEAD 035187600ea] N-Extras: AudioService: Allow system effect sounds to be themed
  76. Author: Nicholas Chum <nicholaschum@gmail.com>
  77. Date: Sun Jul 17 17:56:40 2016 -0400
  78. 1 file changed, 21 insertions(+), 5 deletions(-)
  79. [detached HEAD 169ae5118f9] Themes: Expose resolver hardcoded colors
  80. Author: Dave Kover <dkover@cyngn.com>
  81. Date: Fri Dec 9 10:47:17 2016 -0700
  82. 5 files changed, 31 insertions(+), 11 deletions(-)
  83. create mode 100644 core/res/res/values/projekt_colors.xml
  84. [detached HEAD bb6219e3aeb] Themes: Allow Immersive cling colors to be fully themed
  85. Author: Nicholas Chum <nicholaschum@gmail.com>
  86. Date: Tue Nov 17 18:57:11 2015 -0500
  87. 2 files changed, 9 insertions(+), 6 deletions(-)
  88. [detached HEAD 1464735c812] Themes: Allow Permission Icons to be fully themed
  89. Author: Nicholas Chum <nicholaschum@gmail.com>
  90. Date: Mon Nov 23 23:49:15 2015 -0500
  91. 2 files changed, 2 insertions(+), 1 deletion(-)
  92. [detached HEAD f588e3fd5a8] Themes: Allow Navbar ripple color to be themed
  93. Author: Dave Kover <dkover@cyngn.com>
  94. Date: Thu Apr 14 10:19:13 2016 +0700
  95. 2 files changed, 25 insertions(+), 1 deletion(-)
  96. create mode 100644 packages/SystemUI/res/values/projekt_colors.xml
  97. [detached HEAD 369d65eb8fd] SystemUI: Expose QS edit item decoration background color
  98. Author: Ivan Iskandar <iiiiskandar14@gmail.com>
  99. Date: Sun Sep 18 21:33:18 2016 +0700
  100. 2 files changed, 6 insertions(+), 2 deletions(-)
  101. [detached HEAD 2bb03f2fc75] Allow custom alpha for notification shade bg color
  102. Author: Simao Gomes Viana <xdevs23@outlook.com>
  103. Date: Fri Nov 25 20:50:29 2016 +0100
  104. 1 file changed, 27 insertions(+), 13 deletions(-)
  105. [detached HEAD 0fec9e30190] Themes: Expose various QuickSettings text colors
  106. Author: Niklas Schnettler (Sh4dowSoul) <niklas.schnettler@gmail.com>
  107. Date: Wed Oct 5 18:07:43 2016 +0200
  108. 3 files changed, 7 insertions(+), 2 deletions(-)
  109. [detached HEAD 37eb481b799] Notifications: Expose a bool to disable dynamic colors
  110. Author: Nicholas Chum <nicholaschum@gmail.com>
  111. Date: Sat Aug 27 10:56:46 2016 -0400
  112. 4 files changed, 72 insertions(+), 3 deletions(-)
  113. create mode 100644 core/res/res/values/projekt_config.xml
  114. create mode 100644 core/res/res/values/projekt_symbols.xml
  115. [detached HEAD b4e7f381747] Notification dynamic colors bool compatible with OMS7
  116. Author: George G <kreach3r@users.noreply.github.com>
  117. Date: Mon Nov 14 14:49:47 2016 +0200
  118. 1 file changed, 2 insertions(+), 2 deletions(-)
  119. [detached HEAD b3151944478] Allow prevention of doze notification color inversion
  120. Author: Daniel Koman <dankoman30@gmail.com>
  121. Date: Fri Apr 17 11:56:28 2015 -0600
  122. 3 files changed, 11 insertions(+), 1 deletion(-)
  123. [detached HEAD 70f5a5bfcf1] OMS7 compatible 'Ambient notification inversion'
  124. Author: George G <kreach3r@users.noreply.github.com>
  125. Date: Mon Nov 14 14:44:17 2016 +0200
  126. 1 file changed, 3 insertions(+), 3 deletions(-)
  127. [detached HEAD 03f7a2cee72] doze: allow grayscale even if invert boolean is false
  128. Author: Daniel Koman <dankoman30@gmail.com>
  129. Date: Wed Sep 28 15:28:26 2016 +0200
  130. 1 file changed, 4 insertions(+), 2 deletions(-)
  131. [detached HEAD c713bec2716] SystemUI: Use own drawables for QS expand icon
  132. Author: Ivan Iskandar <iiiiskandar14@gmail.com>
  133. Date: Mon Dec 5 19:00:04 2016 +0700
  134. 13 files changed, 374 insertions(+), 4 deletions(-)
  135. create mode 100644 packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml
  136. create mode 100644 packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml
  137. create mode 100644 packages/SystemUI/res/anim/ic_qs_collapse_rectangle_2_animation.xml
  138. create mode 100644 packages/SystemUI/res/anim/ic_qs_expand_chevron_01_animation.xml
  139. create mode 100644 packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml
  140. create mode 100644 packages/SystemUI/res/anim/ic_qs_expand_rectangle_4_animation.xml
  141. create mode 100644 packages/SystemUI/res/drawable/ic_qs_collapse.xml
  142. create mode 100644 packages/SystemUI/res/drawable/ic_qs_collapse_animation.xml
  143. create mode 100644 packages/SystemUI/res/drawable/ic_qs_expand.xml
  144. create mode 100644 packages/SystemUI/res/drawable/ic_qs_expand_animation.xml
  145. create mode 100644 packages/SystemUI/res/interpolator/ic_qs_collapse_animation_interpolator_0.xml
  146. create mode 100644 packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml
  147. [detached HEAD 2a32225ef1d] OMS7-N: ApplicationsState: add filter for Substratum overlays [1/2]
  148. Author: George G <kreach3r@users.noreply.github.com>
  149. Date: Mon Jul 4 06:25:15 2016 +0300
  150. 1 file changed, 15 insertions(+), 2 deletions(-)
  151. [detached HEAD d87bc372314] OMS7-N: ApplicationsState: add filter for Substratum icon overlays [1/2]
  152. Author: Kuba Schenk <abukcz@gmail.com>
  153. Date: Thu Dec 1 21:48:26 2016 +0100
  154. 1 file changed, 11 insertions(+)
  155. [detached HEAD dfd0214da29] Themes: Expose QS battery
  156. Author: Abdulwahab Isam <abdoi94.iq@gmail.com>
  157. Date: Fri Oct 7 08:30:11 2016 +0300
  158. 2 files changed, 9 insertions(+), 3 deletions(-)
  159. [detached HEAD 485a94ebe6d] OMS: Introduce MODIFY_OVERLAYS permission for user apps
  160. Author: bigrushdog <randall.rushing@gmail.com>
  161. Date: Mon Dec 19 04:33:31 2016 -0800
  162. 3 files changed, 29 insertions(+), 8 deletions(-)
  163. [detached HEAD fb019fe8fd2] SystemUI: Expose switch bar title
  164. Author: daveyannihilation <daveyannihilation@hotmail.com>
  165. Date: Sun Jan 1 01:47:53 2017 -0700
  166. 2 files changed, 25 insertions(+), 2 deletions(-)
  167. create mode 100644 packages/SystemUI/res/values/projekt_styles.xml
  168. [detached HEAD 9ac682f9015] Expose external qs tile tint color
  169. Author: Alex Cruz <mazdarider23@gmail.com>
  170. Date: Tue Jan 24 11:14:46 2017 +0100
  171. 2 files changed, 3 insertions(+), 1 deletion(-)
  172. [detached HEAD 4d5455c8679] graphics: ADB "N" icon compatible with OMS7
  173. Author: George G <kreach3r@users.noreply.github.com>
  174. Date: Thu Feb 2 01:52:27 2017 +0200
  175. 1 file changed, 1 insertion(+), 1 deletion(-)
  176. [detached HEAD 5ada0fbcb56] Set external QS tiles tint mode to SRC_ATOP
  177. Author: Alex Cruz <mazdarider23@gmail.com>
  178. Date: Sat Feb 4 14:13:26 2017 +0100
  179. 1 file changed, 2 insertions(+)
  180. [detached HEAD b41f9893395] Themes: Expose Keyguard affordance circle background
  181. Author: Branden M <wasabi.dev@gmail.com>
  182. Date: Wed Feb 1 22:22:45 2017 -0600
  183. 2 files changed, 3 insertions(+), 1 deletion(-)
  184. [detached HEAD 7394479e925] Notification tint: add optional findContrastColor algorithm for dark backgrounds
  185. Author: SpiritCroc <spiritcroc@gmail.com>
  186. Date: Sun Feb 5 12:00:54 2017 +0100
  187. 3 files changed, 68 insertions(+), 2 deletions(-)
  188. [detached HEAD b59e276f36e] Add a protected broadcast for Masquerade events
  189. Author: bigrushdog <randall.rushing@gmail.com>
  190. Date: Sat Jan 14 23:33:38 2017 -0800
  191. 2 files changed, 4 insertions(+), 1 deletion(-)
  192. [detached HEAD c4eab9188b3] OMS7: Rootless Security Update Preparation for March 2017
  193. Author: Nicholas Chum <nicholaschum@gmail.com>
  194. Date: Wed Feb 22 22:55:15 2017 -0500
  195. 2 files changed, 277 deletions(-)
  196. delete mode 100644 services/core/java/com/android/server/om/OverlayManagerShellCommand.java
  197. [detached HEAD 20d0aec3ec9] OMS: Add hide annotation to MODIFY_OVERLAYS permission
  198. Author: Evan Anderson <evananderson@aospa.co>
  199. Date: Mon Feb 27 15:16:18 2017 -0500
  200. 1 file changed, 2 insertions(+), 1 deletion(-)
  201. [detached HEAD cae73f55833] FWB: Give power dialogs own set of volume icons for themes
  202. Author: Bryan Owens <djbryan3540@gmail.com>
  203. Date: Mon Feb 27 19:06:31 2017 -0600
  204. 4 files changed, 63 insertions(+), 3 deletions(-)
  205. create mode 100644 core/res/res/drawable/ic_power_audio_ring_notif.xml
  206. create mode 100644 core/res/res/drawable/ic_power_audio_ring_notif_mute.xml
  207. create mode 100644 core/res/res/drawable/ic_power_audio_ring_notif_vibrate.xml
  208. [detached HEAD baf9703344b] base: Force authorize all calling packages by Masquerade (2/3)
  209. Author: George G <kreach3r@users.noreply.github.com>
  210. Date: Sat Feb 25 17:32:18 2017 +0200
  211. 1 file changed, 6 insertions(+)
  212. [detached HEAD 319920409fb] Revert "Add a protected broadcast for Masquerade events"
  213. Author: Nathan Chancellor <natechancellor@gmail.com>
  214. Date: Sat Mar 4 00:35:08 2017 +0100
  215. 2 files changed, 1 insertion(+), 4 deletions(-)
  216. [detached HEAD f528207e530] ThemeSafety: Introduce App Crash Intent
  217. Author: Ivan Iskandar <iiiiskandar14@gmail.com>
  218. Date: Thu Mar 9 13:28:22 2017 +0100
  219. 1 file changed, 8 insertions(+)
  220. [detached HEAD a244d386809] Expose Screenshot flash and background colors
  221. Author: ezio84 <brabus84@gmail.com>
  222. Date: Tue Mar 7 23:33:40 2017 +0100
  223. 2 files changed, 5 insertions(+), 2 deletions(-)
  224. [detached HEAD af390305db4] Themes: Expose Keyboard Shortcuts Dialog
  225. Author: Bryan Owens <djbryan3540@gmail.com>
  226. Date: Thu Mar 30 13:30:04 2017 -0500
  227. 2 files changed, 4 insertions(+), 1 deletion(-)
  228. [detached HEAD 2bbb5391deb] Hold "volume up" during boot to disable all overlays
  229. Author: George G <kreach3r@users.noreply.github.com>
  230. Date: Sat Mar 11 14:11:54 2017 +0200
  231. 3 files changed, 57 insertions(+)
  232. [detached HEAD 9cb59f51536] Separate tile label color from icon drawable color
  233. Author: bigrushdog <randall.rushing@gmail.com>
  234. Date: Tue Apr 11 01:01:04 2017 -0700
  235. 2 files changed, 4 insertions(+), 1 deletion(-)
  236. [detached HEAD 099a733e036] Themes: Allow volume slider and thumb to work with custom images.
  237. Author: Randall Rushing <randall.rushing@gmail.com>
  238. Date: Sun Jan 10 12:09:58 2016 -0800
  239. 1 file changed, 3 insertions(+)
  240. [detached HEAD cf7763d9943] Add protected broadcast for app crash broadcast
  241. Author: Ivan Iskandar <iiiiskandar14@gmail.com>
  242. Date: Tue Apr 18 11:16:21 2017 +0200
  243. 1 file changed, 2 insertions(+)
  244. [detached HEAD f67e5b24bd4] OMS: StrictMode and files under /data/system/theme/
  245. Author: mickybart <mickybart@pygoscelis.org>
  246. Date: Sat Nov 19 19:05:05 2016 -0500
  247. 1 file changed, 2 insertions(+), 1 deletion(-)
  248. [detached HEAD e418af8aa2e] Fix permissions for CTS [1/2]
  249. Author: Shane Francis <bigbeeshane@gmail.com>
  250. Date: Fri May 12 14:41:11 2017 +0100
  251. 2 files changed, 6 insertions(+), 4 deletions(-)
  252.  
  253.  
  254. =================================
  255. == Merging frameworks/native ==
  256. =================================
  257.  
  258. remote: Counting objects: 7, done.
  259. remote: Total 7 (delta 6), reused 6 (delta 6), pack-reused 1
  260. Unpacking objects: 100% (7/7), done.
  261. From https://github.com/LineageOMS/android_frameworks_native
  262. * branch cm-14.1 -> FETCH_HEAD
  263. HEAD is now at 9fe7f3cba InputDispatcher_test: fix pokeUserActivity after afbd1c1265de317f5ecf44cd400586c53a001ee7
  264. [detached HEAD eea661edb] OMS7-N: installd: add command 'rmidmap'
  265. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  266. Date: Tue Dec 15 14:02:30 2015 +0100
  267. 3 files changed, 23 insertions(+)
  268.  
  269.  
  270. ======================================
  271. == Merging packages/apps/Contacts ==
  272. ======================================
  273.  
  274. remote: Counting objects: 9, done.
  275. remote: Total 9 (delta 6), reused 6 (delta 6), pack-reused 3
  276. Unpacking objects: 100% (9/9), done.
  277. From https://github.com/LineageOMS/android_packages_apps_Contacts
  278. * branch cm-14.1 -> FETCH_HEAD
  279. HEAD is now at 036757988 Automatic translation import
  280. [detached HEAD e71c6b1e6] Themes: Expose hardcoded layout and styles colors
  281. Author: beanstown106 <nbenis106@gmail.com>
  282. Date: Fri Nov 20 17:27:43 2015 -0500
  283. 4 files changed, 49 insertions(+), 15 deletions(-)
  284. create mode 100644 res/values/projekt_colors.xml
  285.  
  286.  
  287. ============================================
  288. == Merging packages/apps/ContactsCommon ==
  289. ============================================
  290.  
  291. remote: Counting objects: 16, done.
  292. remote: Total 16 (delta 14), reused 14 (delta 14), pack-reused 2
  293. Unpacking objects: 100% (16/16), done.
  294. From https://github.com/LineageOMS/android_packages_apps_ContactsCommon
  295. * branch cm-14.1 -> FETCH_HEAD
  296. HEAD is now at 5252984d Automatic translation import
  297. [detached HEAD 76c0d96f] Themes: Expose hardcoded contact tile text colors
  298. Author: bgill55 <bricam55@gmail.com>
  299. Date: Sat Jan 24 18:12:39 2015 -0700
  300. 4 files changed, 25 insertions(+), 3 deletions(-)
  301. create mode 100644 res/values/projekt_colors.xml
  302. [detached HEAD 45c550be] Themes: Define back arrow tint color for themes
  303. Author: Bryan Owens <djbryan3540@gmail.com>
  304. Date: Fri Dec 11 22:04:15 2015 -0600
  305. 2 files changed, 2 insertions(+), 1 deletion(-)
  306.  
  307.  
  308. ====================================
  309. == Merging packages/apps/Dialer ==
  310. ====================================
  311.  
  312. remote: Counting objects: 19, done.
  313. remote: Total 19 (delta 14), reused 14 (delta 14), pack-reused 5
  314. Unpacking objects: 100% (19/19), done.
  315. From https://github.com/LineageOMS/android_packages_apps_Dialer
  316. * branch cm-14.1 -> FETCH_HEAD
  317. HEAD is now at 40dc96437 Automatic translation import
  318. [detached HEAD c9e9f0fe7] Themes: Separate background color from text color
  319. Author: Alex Cruz <mazdarider23@gmail.com>
  320. Date: Thu May 5 11:55:05 2016 -0500
  321. 2 files changed, 22 insertions(+), 2 deletions(-)
  322. create mode 100644 res/values/projekt_colors.xml
  323. [detached HEAD 903ecbe3c] Themes: InCallUI dialpad digits color
  324. Author: George G <kreach3r@users.noreply.github.com>
  325. Date: Mon Nov 14 16:05:32 2016 +0200
  326. 3 files changed, 25 insertions(+)
  327. create mode 100644 res/values/projekt_config.xml
  328.  
  329.  
  330. =============================================
  331. == Merging packages/apps/ExactCalculator ==
  332. =============================================
  333.  
  334. remote: Counting objects: 19, done.
  335. remote: Total 19 (delta 12), reused 12 (delta 12), pack-reused 7
  336. Unpacking objects: 100% (19/19), done.
  337. From https://github.com/LineageOMS/android_packages_apps_ExactCalculator
  338. * branch cm-14.1 -> FETCH_HEAD
  339. HEAD is now at 95c032e Automatic translation import
  340. [detached HEAD 5b608fe] Themes: Expose hard coded background in java
  341. Author: Bryan Owens <djbryan3540@gmail.com>
  342. Date: Tue Dec 29 22:25:10 2015 -0600
  343. 2 files changed, 20 insertions(+), 1 deletion(-)
  344. create mode 100644 res/values/projekt_colors.xml
  345. [detached HEAD 423a355] Themes: Expose all elevations
  346. Author: Abdulwahab Isam <abdoi94.iq@gmail.com>
  347. Date: Mon Sep 19 18:42:06 2016 +0300
  348. 3 files changed, 22 insertions(+), 2 deletions(-)
  349. create mode 100644 res/values/projekt_dimens.xml
  350.  
  351.  
  352. ==============================================
  353. == Merging packages/apps/PackageInstaller ==
  354. ==============================================
  355.  
  356. remote: Counting objects: 9, done.
  357. remote: Total 9 (delta 4), reused 4 (delta 4), pack-reused 5
  358. Unpacking objects: 100% (9/9), done.
  359. From https://github.com/LineageOMS/android_packages_apps_PackageInstaller
  360. * branch cm-14.1 -> FETCH_HEAD
  361. HEAD is now at 4b0c302e Revert "DO NOT MERGE Disable overlays while installer is resumed"
  362. [detached HEAD ede342b3] PackageInstaller: Add tint mode to icons
  363. Author: Bryan Owens <djbryan3540@gmail.com>
  364. Date: Fri Apr 8 19:41:40 2016 -0500
  365. 1 file changed, 2 insertions(+)
  366.  
  367.  
  368. =========================================
  369. == Merging packages/apps/PhoneCommon ==
  370. =========================================
  371.  
  372. remote: Counting objects: 7, done.
  373. remote: Compressing objects: 100% (3/3), done.
  374. remote: Total 7 (delta 5), reused 5 (delta 4), pack-reused 0
  375. Unpacking objects: 100% (7/7), done.
  376. From https://github.com/LineageOMS/android_packages_apps_PhoneCommon
  377. * branch cm-14.1 -> FETCH_HEAD
  378. HEAD is now at 590252b Automatic translation import
  379. [detached HEAD ea55fc3] Themes: Make dialpad seperator line theme-able
  380. Author: Thyrus11 <thyrus11@gmail.com>
  381. Date: Sat Feb 21 10:41:01 2015 +0100
  382. 2 files changed, 22 insertions(+), 2 deletions(-)
  383. create mode 100644 res/values/projekt_colors.xml
  384.  
  385.  
  386. ======================================
  387. == Merging packages/apps/Settings ==
  388. ======================================
  389.  
  390. remote: Counting objects: 219, done.
  391. remote: Total 219 (delta 126), reused 126 (delta 126), pack-reused 93
  392. Receiving objects: 100% (219/219), 65.21 KiB | 498.00 KiB/s, done.
  393. Resolving deltas: 100% (152/152), completed with 46 local objects.
  394. From https://github.com/LineageOMS/android_packages_apps_Settings
  395. * branch cm-14.1 -> FETCH_HEAD
  396. HEAD is now at 0d582edbf7 Automatic translation import
  397. [detached HEAD b2f2aed2b2] Settings: Expose dashboard category and tile color
  398. Author: Ivan Iskandar <iiiiskandar14@gmail.com>
  399. Date: Sun Sep 18 10:12:05 2016 +0700
  400. 5 files changed, 66 insertions(+), 3 deletions(-)
  401. create mode 100644 res/drawable/dashboard_category_title_bg.xml
  402. create mode 100644 res/drawable/dashboard_tile_bg.xml
  403. create mode 100644 res/values/projekt_colors.xml
  404. [detached HEAD 6b28e7e744] Settings: Expose condition card colors
  405. Author: daveyannihilation <daveyannihilation@hotmail.com>
  406. Date: Tue Sep 20 23:35:04 2016 +0800
  407. 2 files changed, 17 insertions(+), 8 deletions(-)
  408. [detached HEAD afaae66a15] Settings: Expose storage summary text
  409. Author: George G <kreach3r@users.noreply.github.com>
  410. Date: Tue Nov 3 23:57:22 2015 +0200
  411. 4 files changed, 17 insertions(+), 3 deletions(-)
  412. [detached HEAD 4c621fa9e9] Settings: Expose gesture settings switchbar
  413. Author: daveyannihilation <daveyannihilation@hotmail.com>
  414. Date: Fri Nov 25 15:20:04 2016 -0700
  415. 2 files changed, 4 insertions(+), 1 deletion(-)
  416. error: could not apply f76b626eae... Settings: Expose storage icon colors
  417. hint: after resolving the conflicts, mark the corrected paths
  418. hint: with 'git add <paths>' or 'git rm <paths>'
  419. hint: and commit the result with 'git commit'
  420. Recorded preimage for 'src/com/android/settings/deviceinfo/StorageSettings.java'
  421.  
  422.  
  423. ===============================
  424. == Merging system/sepolicy ==
  425. ===============================
  426.  
  427. remote: Counting objects: 68, done.
  428. remote: Total 68 (delta 47), reused 47 (delta 47), pack-reused 21
  429. Unpacking objects: 100% (68/68), done.
  430. From https://github.com/LineageOMS/android_system_sepolicy
  431. * branch cm-14.1 -> FETCH_HEAD
  432. HEAD is now at 83840c7 sepolicy: Allow exfat and ntfs access for sdcard
  433. [detached HEAD bc94b8e] OMS7-N: Add service 'overlay' to service_contexts
  434. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  435. Date: Mon Jun 22 09:31:25 2015 +0200
  436. 3 files changed, 3 insertions(+)
  437. [detached HEAD 047a4c6] Introduce sepolicy exceptions for theme assets
  438. Author: d34d <clark@cyngn.com>
  439. Date: Wed Jan 4 10:29:34 2017 -0800
  440. 7 files changed, 26 insertions(+)
  441. [detached HEAD 4e2f7b9] sepolicy: fix themed boot animation
  442. Author: bigrushdog <randall.rushing@gmail.com>
  443. Date: Wed Jan 4 10:31:29 2017 -0800
  444. 1 file changed, 1 insertion(+)
  445. [detached HEAD e0f809e] sepolicy: fix themed sounds
  446. Author: George G <kreach3r@users.noreply.github.com>
  447. Date: Wed Feb 8 17:22:44 2017 +0200
  448. 1 file changed, 4 insertions(+)
  449. [detached HEAD 42879f8] initial policy edits for masquerade to operate rootless
  450. Author: Surge1223 <surge1223@gmail.com>
  451. Date: Sat Feb 18 08:46:15 2017 -0600
  452. 5 files changed, 57 insertions(+), 1 deletion(-)
  453. create mode 100644 masquerade.te
  454. [detached HEAD 196ed37] sepolicy: rename masquerade domain and allow JobService in system_server
  455. Author: Surge1223 <surge1223@gmail.com>
  456. Date: Tue Feb 21 12:28:05 2017 -0600
  457. 7 files changed, 58 insertions(+), 54 deletions(-)
  458. rewrite masquerade.te (76%)
  459. [detached HEAD 47649e6] sepolicy: allow masquerade to read and write theme assets
  460. Author: Surge1223 <surge1223@gmail.com>
  461. Date: Wed Feb 22 20:45:04 2017 -0600
  462. 1 file changed, 12 insertions(+)
  463. [detached HEAD ef5ebc2] sepolicy: Fix application of bootanimation
  464. Author: Miccia <bono.michele94@gmail.com>
  465. Date: Mon Feb 27 12:36:21 2017 +0100
  466. 2 files changed, 7 insertions(+)
  467. [detached HEAD 66069ce] sepolicy: Redo masquerade rules
  468. Author: LuK1337 <priv.luk@gmail.com>
  469. Date: Wed Mar 1 23:11:49 2017 +0100
  470. 4 files changed, 26 insertions(+), 25 deletions(-)
  471. [detached HEAD 949680c] Welcome to Theme Interfacer! [2/2]
  472. Author: Nathan Chancellor <natechancellor@gmail.com>
  473. Date: Sat Mar 4 19:20:10 2017 -0700
  474. 8 files changed, 70 insertions(+), 70 deletions(-)
  475. create mode 100644 interfacer.te
  476. delete mode 100644 masquerade.te
  477. [detached HEAD f073415] sepolicy: add file and domain trans to interfacer
  478. Author: Surge Raval <Surge1223@gmail.com>
  479. Date: Sun Apr 16 05:00:13 2017 +0000
  480. 2 files changed, 6 insertions(+)
  481. [detached HEAD c44963f] sepolicy: Allow system_server to set theme_prop
  482. Author: Harsh Shandilya <msfjarvis@gmail.com>
  483. Date: Tue May 9 09:18:10 2017 +0530
  484. 1 file changed, 1 insertion(+)
  485. [detached HEAD 7de5f21] interfacer: Allow interfacer to find content_service
  486. Author: Harsh Shandilya <msfjarvis@gmail.com>
  487. Date: Sun Jul 16 21:18:59 2017 +0530
  488. 1 file changed, 1 insertion(+)
  489.  
  490.  
  491. =========================
  492. == Merging vendor/cm ==
  493. =========================
  494.  
  495. remote: Counting objects: 16, done.
  496. remote: Total 16 (delta 13), reused 13 (delta 13), pack-reused 3
  497. Unpacking objects: 100% (16/16), done.
  498. From https://github.com/LineageOMS/android_vendor_cm
  499. * branch cm-14.1 -> FETCH_HEAD
  500. HEAD is now at 2179abe8 cm: Append time of day to zip names for unofficials
  501. [detached HEAD ded809c7] Config: Build ThemeInterfacer
  502. Author: Nathan Chancellor <natechancellor@gmail.com>
  503. Date: Mon Mar 27 22:30:17 2017 -0700
  504. 1 file changed, 1 insertion(+)
  505. error: could not apply e098867d... Remove all traces of CMTE policy
  506. hint: after resolving the conflicts, mark the corrected paths
  507. hint: with 'git add <paths>' or 'git rm <paths>'
  508. hint: and commit the result with 'git commit'
  509. Recorded preimage for 'sepolicy/mac_permissions.xml'
  510.  
  511.  
  512. =================================================
  513. == Syncing packages/services/ThemeInterfacer ==
  514. =================================================
  515.  
  516. Fetching project substratum/interfacer
  517. % Total % Received % Xferd Average Speed Time Time Time Current
  518. Dload Upload Total Spent Left Speed
  519. 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
  520. curl: (22) The requested URL returned error: 404 Not Found
  521. Server does not provide clone.bundle; ignoring.
  522. remote: Counting objects: 887, done.
  523. remote: Total 887 (delta 0), reused 0 (delta 0), pack-reused 887
  524. Receiving objects: 100% (887/887), 321.45 KiB | 560.00 KiB/s, done.
  525. Resolving deltas: 100% (323/323), done.
  526. From https://github.com/substratum/interfacer
  527. * [new branch] n-rootless -> github/n-rootless
  528. Fetching projects: 100% (1/1), done.
  529.  
  530.  
  531. ===============
  532. == RESULTS ==
  533. ===============
  534.  
  535. frameworks/base: SUCCESS
  536. frameworks/native: SUCCESS
  537. packages/apps/Contacts: SUCCESS
  538. packages/apps/ContactsCommon: SUCCESS
  539. packages/apps/Dialer: SUCCESS
  540. packages/apps/ExactCalculator: SUCCESS
  541. packages/apps/PackageInstaller: SUCCESS
  542. packages/apps/PhoneCommon: SUCCESS
  543. packages/apps/Settings: FAILED
  544. system/sepolicy: SUCCESS
  545. vendor/cm: FAILED
  546.  
  547.  
  548. =========================
  549. == SCRIPT COMPLETED! ==
  550. =========================
  551.  
  552. TIME: 1 MINUTE AND 11 SECONDS
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!