API tools faq
paste
Guest User

Untitled

a guest
Apr 19th, 2017
34
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 36.96 KB | None | 0 0
raw download clone embed print report
  1. dragon@Raja:~/lin/frameworks/base$ git status
  2. HEAD detached at bdf823e
  3. You are currently cherry-picking commit 835fcfb.
  4. (all conflicts fixed: run "git cherry-pick --continue")
  5. (use "git cherry-pick --abort" to cancel the cherry-pick operation)
  6.  
  7. Changes to be committed:
  8.  
  9. new file: packages/SystemUI/res/drawable/volte.xml
  10. modified: packages/SystemUI/res/layout/signal_cluster_view.xml
  11. modified: packages/SystemUI/res/values/cm_strings.xml
  12. modified: packages/SystemUI/res/xml/tuner_prefs.xml
  13. modified: packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
  14. modified: packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
  15. modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java
  16. modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
  17. modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
  18. new file: packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalCallbackAdapter.java
  19.  
  20. Changes not staged for commit:
  21. (use "git add/rm <file>..." to update what will be committed)
  22. (use "git checkout -- <file>..." to discard changes in working directory)
  23.  
  24. modified: packages/SystemUI/res/drawable/volte.xml
  25. modified: packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
  26. modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java
  27. deleted: packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalCallbackAdapter.java
  28.  
  29. dragon@Raja:~/lin/frameworks/base$ git rm packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalCallbackAdapter.java
  30. rm 'packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalCallbackAdapter.java'
  31. dragon@Raja:~/lin/frameworks/base$ git add .
  32. dragon@Raja:~/lin/frameworks/base$ git status
  33. HEAD detached at bdf823e
  34. You are currently cherry-picking commit 835fcfb.
  35. (all conflicts fixed: run "git cherry-pick --continue")
  36. (use "git cherry-pick --abort" to cancel the cherry-pick operation)
  37.  
  38. Changes to be committed:
  39.  
  40. new file: packages/SystemUI/res/drawable/volte.xml
  41. modified: packages/SystemUI/res/layout/signal_cluster_view.xml
  42. modified: packages/SystemUI/res/values/cm_strings.xml
  43. modified: packages/SystemUI/res/xml/tuner_prefs.xml
  44. modified: packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
  45. modified: packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
  46. modified: packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
  47. modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java
  48. modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
  49. modified: packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
  50.  
  51. dragon@Raja:~/lin/frameworks/base$ git commit
  52. Recorded resolution for 'packages/SystemUI/res/xml/tuner_prefs.xml'.
  53. Recorded resolution for 'packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java'.
  54. Recorded resolution for 'packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java'.
  55. Recorded resolution for 'packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java'.
  56. Recorded resolution for 'packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java'.
  57. Recorded resolution for 'packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java'.
  58. [detached HEAD 6396fe7] Add VOLTE icon
  59. Author: xyyx <xyyx@mail.ru>
  60. Date: Sun Feb 12 12:37:45 2017 +0800
  61. 10 files changed, 112 insertions(+), 10 deletions(-)
  62. create mode 100644 packages/SystemUI/res/drawable/volte.xml
  63. dragon@Raja:~/lin/frameworks/base$ git remote add lin https://github.com/Dragon-oniv/android_frameworks_base
  64. dragon@Raja:~/lin/frameworks/base$ git push
  65. fatal: No configured push destination.
  66. Either specify the URL from the command-line or configure a remote repository using
  67.  
  68. git remote add <name> <url>
  69.  
  70. and then push using the remote name
  71.  
  72. git push <name>
  73.  
  74. dragon@Raja:~/lin/frameworks/base$ git push lin
  75. warning: push.default is unset; its implicit value has changed in
  76. Git 2.0 from 'matching' to 'simple'. To squelch this message
  77. and maintain the traditional behavior, use:
  78.  
  79. git config --global push.default matching
  80.  
  81. To squelch this message and adopt the new behavior now, use:
  82.  
  83. git config --global push.default simple
  84.  
  85. When push.default is set to 'matching', git will push local branches
  86. to the remote branches that already exist with the same name.
  87.  
  88. Since Git 2.0, Git defaults to the more conservative 'simple'
  89. behavior, which only pushes the current branch to the corresponding
  90. remote branch that 'git pull' uses to update the current branch.
  91.  
  92. See 'git help config' and search for 'push.default' for further information.
  93. (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
  94. 'current' instead of 'simple' if you sometimes use older versions of Git)
  95.  
  96. fatal: You are not currently on a branch.
  97. To push the history leading to the current (detached HEAD)
  98. state now, use
  99.  
  100. git push lin HEAD:<name-of-remote-branch>
  101.  
  102. dragon@Raja:~/lin/frameworks/base$ git push lin HEAD:lin
  103. Username for 'https://github.com': Dragon-oniv
  104. Password for 'https://Dragon-oniv@github.com':
  105. error: unable to push to unqualified destination: lin
  106. The destination refspec neither matches an existing ref on the remote nor
  107. begins with refs/, and we are unable to guess a prefix based on the source ref.
  108. error: failed to push some refs to 'https://github.com/Dragon-oniv/android_frameworks_base'
  109. dragon@Raja:~/lin/frameworks/base$ git branch
  110. * (HEAD detached from bdf823e)
  111. dragon@Raja:~/lin/frameworks/base$ git log
  112. commit 6396fe73b21a94b2d86cebde8c63cdc42462234a
  113. Author: xyyx <xyyx@mail.ru>
  114. Date: Sun Feb 12 12:37:45 2017 +0800
  115.  
  116. Add VOLTE icon
  117.  
  118. Extracted from CAF and adapted to AOSP by @xyyx
  119. Added switch to statusbar icon blacklist by @xyyx
  120.  
  121. Original commits:
  122. https://github.com/codeaurora-unofficial/platform-frameworks-base/commit/8c968e8d64abca36987d90d95e6dd1cc951c0e0a
  123. https://github.com/AOSPA/android_frameworks_base/commit/4dabbbe7df5f51f517c13da98809c22b34175964
  124.  
  125. Change-Id: Iba6f695b92997f58d0763098e6902b702925e825
  126. Signed-off-by: Varun Date <date.varun123@gmail.com>
  127.  
  128. commit bdf823ed22aeae9a138975bbe3ee93eb37e67292
  129. Author: Carlo Savignano <carlosavignano@aospa.co>
  130. Date: Tue Oct 25 17:12:49 2016 +0800
  131.  
  132. fingerprint: notify client when cancelling succeeded
  133.  
  134. * Some fingerprint hardware hals might not notify userspace in time
  135. in some scenarios when successful authentication cancel is performed.
  136. * This is observed for example in some devices that have power and/or home
  137. buttons merged with fingerprint sensor, but not limited to such cases.
  138. * Add a opt-in configuration to enable client authentication cancel from
  139. fingerprint service when successful.
  140. * This addresses originally an issue where requesting fingerprint to be
  141. disabled and then enabled will wait till cancelling timeout before changing
  142. fingerprint sensor state and start authenticating again.
  143.  
  144. Change-Id: I6a6795fbb795f0c6a4ff8ad27ac807e2f744c2d9
  145. Signed-off-by: Carlo Savignano <carlosavignano@aospa.co>
  146.  
  147. commit dbfbf86d6dfd5aff209a06836b16c71908655eb3
  148. Author: Arne Coucheron <arco68@gmail.com>
  149. Date: Wed Apr 12 00:05:33 2017 +0200
  150.  
  151. Various fixes and cleanups after 7.1.2 merge
  152.  
  153. * Nuked CAF's modifications for carrier boot animation.
  154. Something we'll never use, and it conflicts with some
  155. related changes Google did in 7.1.2.
  156. * Correctly assign new MAX_PROFILE_ID in BluetoothProfile
  157. * Add missing mHandler in BluetoothManagerService
  158. * Add missing mReset in LightsService
  159. * Remove unused code.
  160. * The rest is just code cleanup and modifications to match upstream
  161. AOSP code. The goal is to minimize future merge conflicts.
  162.  
  163.  
  164. [1]+ Stopped git log
  165. dragon@Raja:~/lin/frameworks/base$ git branch test
  166. dragon@Raja:~/lin/frameworks/base$ git checkout test
  167. Switched to branch 'test'
  168. dragon@Raja:~/lin/frameworks/base$ git branch
  169. * test
  170. dragon@Raja:~/lin/frameworks/base$ git log
  171. commit 6396fe73b21a94b2d86cebde8c63cdc42462234a
  172. Author: xyyx <xyyx@mail.ru>
  173. Date: Sun Feb 12 12:37:45 2017 +0800
  174.  
  175. Add VOLTE icon
  176.  
  177. Extracted from CAF and adapted to AOSP by @xyyx
  178. Added switch to statusbar icon blacklist by @xyyx
  179.  
  180. Original commits:
  181. https://github.com/codeaurora-unofficial/platform-frameworks-base/commit/8c968e8d64abca36987d90d95e6dd1cc951c0e0a
  182. https://github.com/AOSPA/android_frameworks_base/commit/4dabbbe7df5f51f517c13da98809c22b34175964
  183.  
  184. Change-Id: Iba6f695b92997f58d0763098e6902b702925e825
  185. Signed-off-by: Varun Date <date.varun123@gmail.com>
  186.  
  187. commit bdf823ed22aeae9a138975bbe3ee93eb37e67292
  188. Author: Carlo Savignano <carlosavignano@aospa.co>
  189. Date: Tue Oct 25 17:12:49 2016 +0800
  190.  
  191. fingerprint: notify client when cancelling succeeded
  192.  
  193. * Some fingerprint hardware hals might not notify userspace in time
  194. in some scenarios when successful authentication cancel is performed.
  195. * This is observed for example in some devices that have power and/or home
  196. buttons merged with fingerprint sensor, but not limited to such cases.
  197. * Add a opt-in configuration to enable client authentication cancel from
  198. fingerprint service when successful.
  199. * This addresses originally an issue where requesting fingerprint to be
  200. disabled and then enabled will wait till cancelling timeout before changing
  201. fingerprint sensor state and start authenticating again.
  202.  
  203. Change-Id: I6a6795fbb795f0c6a4ff8ad27ac807e2f744c2d9
  204. Signed-off-by: Carlo Savignano <carlosavignano@aospa.co>
  205.  
  206. commit dbfbf86d6dfd5aff209a06836b16c71908655eb3
  207. Author: Arne Coucheron <arco68@gmail.com>
  208. Date: Wed Apr 12 00:05:33 2017 +0200
  209.  
  210. Various fixes and cleanups after 7.1.2 merge
  211.  
  212. * Nuked CAF's modifications for carrier boot animation.
  213. Something we'll never use, and it conflicts with some
  214. related changes Google did in 7.1.2.
  215. * Correctly assign new MAX_PROFILE_ID in BluetoothProfile
  216. * Add missing mHandler in BluetoothManagerService
  217. * Add missing mReset in LightsService
  218. * Remove unused code.
  219. * The rest is just code cleanup and modifications to match upstream
  220. AOSP code. The goal is to minimize future merge conflicts.
  221.  
  222.  
  223. [2]+ Stopped git log
  224. dragon@Raja:~/lin/frameworks/base$ git push git@github.com:Dragon-oniv/android_frameworks_base.git test
  225. Enter passphrase for key '/home/dragon/.ssh/id_rsa':
  226. Enter passphrase for key '/home/dragon/.ssh/id_rsa':
  227. To git@github.com:Dragon-oniv/android_frameworks_base.git
  228. ! [rejected] test -> test (fetch first)
  229. error: failed to push some refs to 'git@github.com:Dragon-oniv/android_frameworks_base.git'
  230. hint: Updates were rejected because the remote contains work that you do
  231. hint: not have locally. This is usually caused by another repository pushing
  232. hint: to the same ref. You may want to first integrate the remote changes
  233. hint: (e.g., 'git pull ...') before pushing again.
  234. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  235. dragon@Raja:~/lin/frameworks/base$ git pull test
  236. fatal: 'test' does not appear to be a git repository
  237. fatal: Could not read from remote repository.
  238.  
  239. Please make sure you have the correct access rights
  240. and the repository exists.
  241. dragon@Raja:~/lin/frameworks/base$ git push
  242. fatal: No configured push destination.
  243. Either specify the URL from the command-line or configure a remote repository using
  244.  
  245. git remote add <name> <url>
  246.  
  247. and then push using the remote name
  248.  
  249. git push <name>
  250.  
  251. dragon@Raja:~/lin/frameworks/base$ git push lin
  252. warning: push.default is unset; its implicit value has changed in
  253. Git 2.0 from 'matching' to 'simple'. To squelch this message
  254. and maintain the traditional behavior, use:
  255.  
  256. git config --global push.default matching
  257.  
  258. To squelch this message and adopt the new behavior now, use:
  259.  
  260. git config --global push.default simple
  261.  
  262. When push.default is set to 'matching', git will push local branches
  263. to the remote branches that already exist with the same name.
  264.  
  265. Since Git 2.0, Git defaults to the more conservative 'simple'
  266. behavior, which only pushes the current branch to the corresponding
  267. remote branch that 'git pull' uses to update the current branch.
  268.  
  269. See 'git help config' and search for 'push.default' for further information.
  270. (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
  271. 'current' instead of 'simple' if you sometimes use older versions of Git)
  272.  
  273. fatal: The current branch test has no upstream branch.
  274. To push the current branch and set the remote as upstream, use
  275.  
  276. git push --set-upstream lin test
  277.  
  278. dragon@Raja:~/lin/frameworks/base$ git push --set-upstream lin test
  279. Username for 'https://github.com': Dragon-oniv
  280. Password for 'https://Dragon-oniv@github.com':
  281. To https://github.com/Dragon-oniv/android_frameworks_base
  282. ! [rejected] test -> test (fetch first)
  283. error: failed to push some refs to 'https://github.com/Dragon-oniv/android_frameworks_base'
  284. hint: Updates were rejected because the remote contains work that you do
  285. hint: not have locally. This is usually caused by another repository pushing
  286. hint: to the same ref. You may want to first integrate the remote changes
  287. hint: (e.g., 'git pull ...') before pushing again.
  288. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  289. dragon@Raja:~/lin/frameworks/base$ git push
  290. fatal: No configured push destination.
  291. Either specify the URL from the command-line or configure a remote repository using
  292.  
  293. git remote add <name> <url>
  294.  
  295. and then push using the remote name
  296.  
  297. git push <name>
  298.  
  299. dragon@Raja:~/lin/frameworks/base$ git push lin
  300. warning: push.default is unset; its implicit value has changed in
  301. Git 2.0 from 'matching' to 'simple'. To squelch this message
  302. and maintain the traditional behavior, use:
  303.  
  304. git config --global push.default matching
  305.  
  306. To squelch this message and adopt the new behavior now, use:
  307.  
  308. git config --global push.default simple
  309.  
  310. When push.default is set to 'matching', git will push local branches
  311. to the remote branches that already exist with the same name.
  312.  
  313. Since Git 2.0, Git defaults to the more conservative 'simple'
  314. behavior, which only pushes the current branch to the corresponding
  315. remote branch that 'git pull' uses to update the current branch.
  316.  
  317. See 'git help config' and search for 'push.default' for further information.
  318. (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
  319. 'current' instead of 'simple' if you sometimes use older versions of Git)
  320.  
  321. fatal: The current branch test has no upstream branch.
  322. To push the current branch and set the remote as upstream, use
  323.  
  324. git push --set-upstream lin test
  325.  
  326. dragon@Raja:~/lin/frameworks/base$ git push --set-upstream lin cm-14.1
  327. error: src refspec cm-14.1 does not match any.
  328. error: failed to push some refs to 'https://github.com/Dragon-oniv/android_frameworks_base'
  329. dragon@Raja:~/lin/frameworks/base$ git push
  330. fatal: No configured push destination.
  331. Either specify the URL from the command-line or configure a remote repository using
  332.  
  333. git remote add <name> <url>
  334.  
  335. and then push using the remote name
  336.  
  337. git push <name>
  338.  
  339. dragon@Raja:~/lin/frameworks/base$ git remote add cm-14.1 https://github.com/Dragon-oniv/android_frameworks_base
  340. dragon@Raja:~/lin/frameworks/base$ git push cm-14.1
  341. warning: push.default is unset; its implicit value has changed in
  342. Git 2.0 from 'matching' to 'simple'. To squelch this message
  343. and maintain the traditional behavior, use:
  344.  
  345. git config --global push.default matching
  346.  
  347. To squelch this message and adopt the new behavior now, use:
  348.  
  349. git config --global push.default simple
  350.  
  351. When push.default is set to 'matching', git will push local branches
  352. to the remote branches that already exist with the same name.
  353.  
  354. Since Git 2.0, Git defaults to the more conservative 'simple'
  355. behavior, which only pushes the current branch to the corresponding
  356. remote branch that 'git pull' uses to update the current branch.
  357.  
  358. See 'git help config' and search for 'push.default' for further information.
  359. (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
  360. 'current' instead of 'simple' if you sometimes use older versions of Git)
  361.  
  362. fatal: The current branch test has no upstream branch.
  363. To push the current branch and set the remote as upstream, use
  364.  
  365. git push --set-upstream cm-14.1 test
  366.  
  367. dragon@Raja:~/lin/frameworks/base$ git push --set-upstream cm-14.1 cm-14.1
  368. error: src refspec cm-14.1 does not match any.
  369. error: failed to push some refs to 'https://github.com/Dragon-oniv/android_frameworks_base'
  370. dragon@Raja:~/lin/frameworks/base$ git push --set-upstream cm-14.1 test
  371. Username for 'https://github.com': Dragon-oniv
  372. Password for 'https://Dragon-oniv@github.com':
  373. To https://github.com/Dragon-oniv/android_frameworks_base
  374. ! [rejected] test -> test (fetch first)
  375. error: failed to push some refs to 'https://github.com/Dragon-oniv/android_frameworks_base'
  376. hint: Updates were rejected because the remote contains work that you do
  377. hint: not have locally. This is usually caused by another repository pushing
  378. hint: to the same ref. You may want to first integrate the remote changes
  379. hint: (e.g., 'git pull ...') before pushing again.
  380. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  381. dragon@Raja:~/lin/frameworks/base$ git pull cm-14.1
  382. remote: Counting objects: 131927, done.
  383. remote: Compressing objects: 100% (45/45), done.
  384. remote: Total 131927 (delta 42399), reused 42376 (delta 42376), pack-reused 89491
  385. Receiving objects: 100% (131927/131927), 44.65 MiB | 12.18 MiB/s, done.
  386. Resolving deltas: 100% (85963/85963), completed with 5660 local objects.
  387. From https://github.com/Dragon-oniv/android_frameworks_base
  388. * [new branch] bt-next -> cm-14.1/bt-next
  389. * [new branch] caf-rb -> cm-14.1/caf-rb
  390. * [new branch] caf/cm-12.0 -> cm-14.1/caf/cm-12.0
  391. * [new branch] caf/cm-12.1 -> cm-14.1/caf/cm-12.1
  392. * [new branch] cm-10.1 -> cm-14.1/cm-10.1
  393. * [new branch] cm-10.2 -> cm-14.1/cm-10.2
  394. * [new branch] cm-11.0 -> cm-14.1/cm-11.0
  395. * [new branch] cm-12.0 -> cm-14.1/cm-12.0
  396. * [new branch] cm-12.1 -> cm-14.1/cm-12.1
  397. * [new branch] cm-13.0 -> cm-14.1/cm-13.0
  398. * [new branch] cm-14.0 -> cm-14.1/cm-14.0
  399. * [new branch] cm-14.1 -> cm-14.1/cm-14.1
  400. * [new branch] cm-14.1-cafrebase -> cm-14.1/cm-14.1-cafrebase
  401. * [new branch] cm-14.1_old -> cm-14.1/cm-14.1_old
  402. * [new branch] cm-14.1_prerebase -> cm-14.1/cm-14.1_prerebase
  403. * [new branch] cm-9.1.0 -> cm-14.1/cm-9.1.0
  404. * [new branch] donut -> cm-14.1/donut
  405. * [new branch] eclair -> cm-14.1/eclair
  406. * [new branch] froyo -> cm-14.1/froyo
  407. * [new branch] froyo-stable -> cm-14.1/froyo-stable
  408. * [new branch] gb-release-7.2 -> cm-14.1/gb-release-7.2
  409. * [new branch] gingerbread -> cm-14.1/gingerbread
  410. * [new branch] gingerbread-release -> cm-14.1/gingerbread-release
  411. * [new branch] ics -> cm-14.1/ics
  412. * [new branch] ics-release -> cm-14.1/ics-release
  413. * [new branch] jellybean -> cm-14.1/jellybean
  414. * [new branch] jellybean-stable -> cm-14.1/jellybean-stable
  415. * [new branch] next -> cm-14.1/next
  416. * [new branch] previewgen2 -> cm-14.1/previewgen2
  417. * [new branch] qcril -> cm-14.1/qcril
  418. * [new branch] shipping/cm-11.0 -> cm-14.1/shipping/cm-11.0
  419. * [new branch] stable/cm-10.2 -> cm-14.1/stable/cm-10.2
  420. * [new branch] stable/cm-11.0 -> cm-14.1/stable/cm-11.0
  421. * [new branch] stable/cm-11.0-XNF8Y -> cm-14.1/stable/cm-11.0-XNF8Y
  422. * [new branch] stable/cm-11.0-XNF9X -> cm-14.1/stable/cm-11.0-XNF9X
  423. * [new branch] stable/cm-11.0-XNG2S -> cm-14.1/stable/cm-11.0-XNG2S
  424. * [new branch] stable/cm-11.0-XNG3C -> cm-14.1/stable/cm-11.0-XNG3C
  425. * [new branch] stable/cm-12.0-YNG1I -> cm-14.1/stable/cm-12.0-YNG1I
  426. * [new branch] stable/cm-12.0-YNG1T -> cm-14.1/stable/cm-12.0-YNG1T
  427. * [new branch] stable/cm-12.0-YNG1TA -> cm-14.1/stable/cm-12.0-YNG1TA
  428. * [new branch] stable/cm-12.0-YNG3C -> cm-14.1/stable/cm-12.0-YNG3C
  429. * [new branch] stable/cm-12.0-YNG4N -> cm-14.1/stable/cm-12.0-YNG4N
  430. * [new branch] stable/cm-12.1-YOG3C -> cm-14.1/stable/cm-12.1-YOG3C
  431. * [new branch] stable/cm-12.1-YOG4P -> cm-14.1/stable/cm-12.1-YOG4P
  432. * [new branch] stable/cm-12.1-YOG7D -> cm-14.1/stable/cm-12.1-YOG7D
  433. * [new branch] stable/cm-13.0-ZNH0E -> cm-14.1/stable/cm-13.0-ZNH0E
  434. * [new branch] stable/cm-13.0-ZNH2K -> cm-14.1/stable/cm-13.0-ZNH2K
  435. * [new branch] stable/cm-13.0-ZNH2K-ridesharing -> cm-14.1/stable/cm-13.0-ZNH2K-ridesharing
  436. * [new branch] stable/cm-13.0-ZNH2KB -> cm-14.1/stable/cm-13.0-ZNH2KB
  437. * [new branch] stable/cm-13.0-ZNH5Y -> cm-14.1/stable/cm-13.0-ZNH5Y
  438. * [new branch] staging/LNX.LA.3.7.1.1 -> cm-14.1/staging/LNX.LA.3.7.1.1
  439. * [new branch] staging/caf/LA.BR.1.2.6.c1-01200-8x09.0_LLS -> cm-14.1/staging/caf/LA.BR.1.2.6.c1-01200-8x09.0_LLS
  440. * [new branch] staging/caf/themes/cm-12.0 -> cm-14.1/staging/caf/themes/cm-12.0
  441. * [new branch] staging/cm-12.0-YNG1T-prebundle -> cm-14.1/staging/cm-12.0-YNG1T-prebundle
  442. * [new branch] staging/cm-12.0-YNG1T-rendang-test -> cm-14.1/staging/cm-12.0-YNG1T-rendang-test
  443. * [new branch] staging/cm-12.0-caf -> cm-14.1/staging/cm-12.0-caf
  444. * [new branch] staging/cm-12.1 -> cm-14.1/staging/cm-12.1
  445. * [new branch] staging/cm-12.1-amss-2.1-ims -> cm-14.1/staging/cm-12.1-amss-2.1-ims
  446. * [new branch] staging/cm-13.0+r22 -> cm-14.1/staging/cm-13.0+r22
  447. * [new branch] staging/cm-13.0-caf -> cm-14.1/staging/cm-13.0-caf
  448. * [new branch] staging/cm-14.0-caf -> cm-14.1/staging/cm-14.0-caf
  449. * [new branch] staging/cm-14.1-cafrebase -> cm-14.1/staging/cm-14.1-cafrebase
  450. * [new branch] staging/cm-14.1_android-7.1.2_r2 -> cm-14.1/staging/cm-14.1_android-7.1.2_r2
  451. * [new branch] staging/fpstable -> cm-14.1/staging/fpstable
  452. * [new branch] staging/fpstable2 -> cm-14.1/staging/fpstable2
  453. * [new branch] staging/insight -> cm-14.1/staging/insight
  454. * [new branch] test -> cm-14.1/test
  455. You asked to pull from the remote 'cm-14.1', but did not specify
  456. a branch. Because this is not the default configured remote
  457. for your current branch, you must specify a branch on the command line.
  458. dragon@Raja:~/lin/frameworks/base$ git push --set-upstream cm-14.1 cm-14.1
  459. error: src refspec cm-14.1 does not match any.
  460. error: failed to push some refs to 'https://github.com/Dragon-oniv/android_frameworks_base'
  461. dragon@Raja:~/lin/frameworks/base$ git push --set-upstream cm-14.1 test
  462. Username for 'https://github.com': Dragon-oniv
  463. Password for 'https://Dragon-oniv@github.com':
  464. To https://github.com/Dragon-oniv/android_frameworks_base
  465. ! [rejected] test -> test (non-fast-forward)
  466. error: failed to push some refs to 'https://github.com/Dragon-oniv/android_frameworks_base'
  467. hint: Updates were rejected because the tip of your current branch is behind
  468. hint: its remote counterpart. Integrate the remote changes (e.g.
  469. hint: 'git pull ...') before pushing again.
  470. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  471. dragon@Raja:~/lin/frameworks/base$ git status
  472. On branch test
  473. nothing to commit, working directory clean
  474. dragon@Raja:~/lin/frameworks/base$ git remote
  475. cm-14.1
  476. github
  477. lin
  478. rr
  479. dragon@Raja:~/lin/frameworks/base$ git remote rm cm-14.1
  480. dragon@Raja:~/lin/frameworks/base$ git remote rm lin
  481. dragon@Raja:~/lin/frameworks/base$ git remote rm rr
  482. dragon@Raja:~/lin/frameworks/base$ git remote
  483. github
  484. dragon@Raja:~/lin/frameworks/base$ git branch
  485. * test
  486. dragon@Raja:~/lin/frameworks/base$
  487. dragon@Raja:~/lin/frameworks/base$ git push
  488. fatal: No configured push destination.
  489. Either specify the URL from the command-line or configure a remote repository using
  490.  
  491. git remote add <name> <url>
  492.  
  493. and then push using the remote name
  494.  
  495. git push <name>
  496.  
  497. dragon@Raja:~/lin/frameworks/base$ git remote add lin https://github.com/Dragon-oniv/android_frameworks_base
  498. dragon@Raja:~/lin/frameworks/base$ git push lin
  499. warning: push.default is unset; its implicit value has changed in
  500. Git 2.0 from 'matching' to 'simple'. To squelch this message
  501. and maintain the traditional behavior, use:
  502.  
  503. git config --global push.default matching
  504.  
  505. To squelch this message and adopt the new behavior now, use:
  506.  
  507. git config --global push.default simple
  508.  
  509. When push.default is set to 'matching', git will push local branches
  510. to the remote branches that already exist with the same name.
  511.  
  512. Since Git 2.0, Git defaults to the more conservative 'simple'
  513. behavior, which only pushes the current branch to the corresponding
  514. remote branch that 'git pull' uses to update the current branch.
  515.  
  516. See 'git help config' and search for 'push.default' for further information.
  517. (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode
  518. 'current' instead of 'simple' if you sometimes use older versions of Git)
  519.  
  520. fatal: The current branch test has no upstream branch.
  521. To push the current branch and set the remote as upstream, use
  522.  
  523. git push --set-upstream lin test
  524.  
  525. dragon@Raja:~/lin/frameworks/base$ git push --set-upstream lin test
  526. Username for 'https://github.com': Dragon-oniv
  527. Password for 'https://Dragon-oniv@github.com':
  528. To https://github.com/Dragon-oniv/android_frameworks_base
  529. ! [rejected] test -> test (non-fast-forward)
  530. error: failed to push some refs to 'https://github.com/Dragon-oniv/android_frameworks_base'
  531. hint: Updates were rejected because the tip of your current branch is behind
  532. hint: its remote counterpart. Integrate the remote changes (e.g.
  533. hint: 'git pull ...') before pushing again.
  534. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  535. dragon@Raja:~/lin/frameworks/base$ git log
  536. commit 6396fe73b21a94b2d86cebde8c63cdc42462234a
  537. Author: xyyx <xyyx@mail.ru>
  538. Date: Sun Feb 12 12:37:45 2017 +0800
  539.  
  540. Add VOLTE icon
  541.  
  542. Extracted from CAF and adapted to AOSP by @xyyx
  543. Added switch to statusbar icon blacklist by @xyyx
  544.  
  545. Original commits:
  546. https://github.com/codeaurora-unofficial/platform-frameworks-base/commit/8c968e8d64abca36987d90d95e6dd1cc951c0e0a
  547. https://github.com/AOSPA/android_frameworks_base/commit/4dabbbe7df5f51f517c13da98809c22b34175964
  548.  
  549. Change-Id: Iba6f695b92997f58d0763098e6902b702925e825
  550. Signed-off-by: Varun Date <date.varun123@gmail.com>
  551.  
  552. commit bdf823ed22aeae9a138975bbe3ee93eb37e67292
  553. Author: Carlo Savignano <carlosavignano@aospa.co>
  554. Date: Tue Oct 25 17:12:49 2016 +0800
  555.  
  556. fingerprint: notify client when cancelling succeeded
  557.  
  558. * Some fingerprint hardware hals might not notify userspace in time
  559. in some scenarios when successful authentication cancel is performed.
  560. * This is observed for example in some devices that have power and/or home
  561. buttons merged with fingerprint sensor, but not limited to such cases.
  562. * Add a opt-in configuration to enable client authentication cancel from
  563. fingerprint service when successful.
  564. * This addresses originally an issue where requesting fingerprint to be
  565. disabled and then enabled will wait till cancelling timeout before changing
  566. fingerprint sensor state and start authenticating again.
  567.  
  568. Change-Id: I6a6795fbb795f0c6a4ff8ad27ac807e2f744c2d9
  569. Signed-off-by: Carlo Savignano <carlosavignano@aospa.co>
  570.  
  571. commit dbfbf86d6dfd5aff209a06836b16c71908655eb3
  572. Author: Arne Coucheron <arco68@gmail.com>
  573. Date: Wed Apr 12 00:05:33 2017 +0200
  574.  
  575. Various fixes and cleanups after 7.1.2 merge
  576.  
  577. * Nuked CAF's modifications for carrier boot animation.
  578. Something we'll never use, and it conflicts with some
  579. related changes Google did in 7.1.2.
  580. * Correctly assign new MAX_PROFILE_ID in BluetoothProfile
  581. * Add missing mHandler in BluetoothManagerService
  582. * Add missing mReset in LightsService
  583. * Remove unused code.
  584. * The rest is just code cleanup and modifications to match upstream
  585. AOSP code. The goal is to minimize future merge conflicts.
  586.  
  587.  
  588. [3]+ Stopped git log
  589. dragon@Raja:~/lin/frameworks/base$ git pull test
  590. fatal: 'test' does not appear to be a git repository
  591. fatal: Could not read from remote repository.
  592.  
  593. Please make sure you have the correct access rights
  594. and the repository exists.
  595. dragon@Raja:~/lin/frameworks/base$ git pull lin
  596. From https://github.com/Dragon-oniv/android_frameworks_base
  597. * [new branch] bt-next -> lin/bt-next
  598. * [new branch] caf-rb -> lin/caf-rb
  599. * [new branch] caf/cm-12.0 -> lin/caf/cm-12.0
  600. * [new branch] caf/cm-12.1 -> lin/caf/cm-12.1
  601. * [new branch] cm-10.1 -> lin/cm-10.1
  602. * [new branch] cm-10.2 -> lin/cm-10.2
  603. * [new branch] cm-11.0 -> lin/cm-11.0
  604. * [new branch] cm-12.0 -> lin/cm-12.0
  605. * [new branch] cm-12.1 -> lin/cm-12.1
  606. * [new branch] cm-13.0 -> lin/cm-13.0
  607. * [new branch] cm-14.0 -> lin/cm-14.0
  608. * [new branch] cm-14.1 -> lin/cm-14.1
  609. * [new branch] cm-14.1-cafrebase -> lin/cm-14.1-cafrebase
  610. * [new branch] cm-14.1_old -> lin/cm-14.1_old
  611. * [new branch] cm-14.1_prerebase -> lin/cm-14.1_prerebase
  612. * [new branch] cm-9.1.0 -> lin/cm-9.1.0
  613. * [new branch] donut -> lin/donut
  614. * [new branch] eclair -> lin/eclair
  615. * [new branch] froyo -> lin/froyo
  616. * [new branch] froyo-stable -> lin/froyo-stable
  617. * [new branch] gb-release-7.2 -> lin/gb-release-7.2
  618. * [new branch] gingerbread -> lin/gingerbread
  619. * [new branch] gingerbread-release -> lin/gingerbread-release
  620. * [new branch] ics -> lin/ics
  621. * [new branch] ics-release -> lin/ics-release
  622. * [new branch] jellybean -> lin/jellybean
  623. * [new branch] jellybean-stable -> lin/jellybean-stable
  624. * [new branch] next -> lin/next
  625. * [new branch] previewgen2 -> lin/previewgen2
  626. * [new branch] qcril -> lin/qcril
  627. * [new branch] shipping/cm-11.0 -> lin/shipping/cm-11.0
  628. * [new branch] stable/cm-10.2 -> lin/stable/cm-10.2
  629. * [new branch] stable/cm-11.0 -> lin/stable/cm-11.0
  630. * [new branch] stable/cm-11.0-XNF8Y -> lin/stable/cm-11.0-XNF8Y
  631. * [new branch] stable/cm-11.0-XNF9X -> lin/stable/cm-11.0-XNF9X
  632. * [new branch] stable/cm-11.0-XNG2S -> lin/stable/cm-11.0-XNG2S
  633. * [new branch] stable/cm-11.0-XNG3C -> lin/stable/cm-11.0-XNG3C
  634. * [new branch] stable/cm-12.0-YNG1I -> lin/stable/cm-12.0-YNG1I
  635. * [new branch] stable/cm-12.0-YNG1T -> lin/stable/cm-12.0-YNG1T
  636. * [new branch] stable/cm-12.0-YNG1TA -> lin/stable/cm-12.0-YNG1TA
  637. * [new branch] stable/cm-12.0-YNG3C -> lin/stable/cm-12.0-YNG3C
  638. * [new branch] stable/cm-12.0-YNG4N -> lin/stable/cm-12.0-YNG4N
  639. * [new branch] stable/cm-12.1-YOG3C -> lin/stable/cm-12.1-YOG3C
  640. * [new branch] stable/cm-12.1-YOG4P -> lin/stable/cm-12.1-YOG4P
  641. * [new branch] stable/cm-12.1-YOG7D -> lin/stable/cm-12.1-YOG7D
  642. * [new branch] stable/cm-13.0-ZNH0E -> lin/stable/cm-13.0-ZNH0E
  643. * [new branch] stable/cm-13.0-ZNH2K -> lin/stable/cm-13.0-ZNH2K
  644. * [new branch] stable/cm-13.0-ZNH2K-ridesharing -> lin/stable/cm-13.0-ZNH2K-ridesharing
  645. * [new branch] stable/cm-13.0-ZNH2KB -> lin/stable/cm-13.0-ZNH2KB
  646. * [new branch] stable/cm-13.0-ZNH5Y -> lin/stable/cm-13.0-ZNH5Y
  647. * [new branch] staging/LNX.LA.3.7.1.1 -> lin/staging/LNX.LA.3.7.1.1
  648. * [new branch] staging/caf/LA.BR.1.2.6.c1-01200-8x09.0_LLS -> lin/staging/caf/LA.BR.1.2.6.c1-01200-8x09.0_LLS
  649. * [new branch] staging/caf/themes/cm-12.0 -> lin/staging/caf/themes/cm-12.0
  650. * [new branch] staging/cm-12.0-YNG1T-prebundle -> lin/staging/cm-12.0-YNG1T-prebundle
  651. * [new branch] staging/cm-12.0-YNG1T-rendang-test -> lin/staging/cm-12.0-YNG1T-rendang-test
  652. * [new branch] staging/cm-12.0-caf -> lin/staging/cm-12.0-caf
  653. * [new branch] staging/cm-12.1 -> lin/staging/cm-12.1
  654. * [new branch] staging/cm-12.1-amss-2.1-ims -> lin/staging/cm-12.1-amss-2.1-ims
  655. * [new branch] staging/cm-13.0+r22 -> lin/staging/cm-13.0+r22
  656. * [new branch] staging/cm-13.0-caf -> lin/staging/cm-13.0-caf
  657. * [new branch] staging/cm-14.0-caf -> lin/staging/cm-14.0-caf
  658. * [new branch] staging/cm-14.1-cafrebase -> lin/staging/cm-14.1-cafrebase
  659. * [new branch] staging/cm-14.1_android-7.1.2_r2 -> lin/staging/cm-14.1_android-7.1.2_r2
  660. * [new branch] staging/fpstable -> lin/staging/fpstable
  661. * [new branch] staging/fpstable2 -> lin/staging/fpstable2
  662. * [new branch] staging/insight -> lin/staging/insight
  663. * [new branch] test -> lin/test
  664. You asked to pull from the remote 'lin', but did not specify
  665. a branch. Because this is not the default configured remote
  666. for your current branch, you must specify a branch on the command line.
  667. dragon@Raja:~/lin/frameworks/base$ git pull lin test
  668. From https://github.com/Dragon-oniv/android_frameworks_base
  669. * branch test -> FETCH_HEAD
  670. Merge made by the 'recursive' strategy.
  671. packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml | 8 ++++++++
  672. packages/SystemUI/res/values/colors.xml | 2 +-
  673. packages/SystemUI/res/values/config.xml | 3 +++
  674. packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 7 ++++++-
  675. packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java | 3 +++
  676. packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java | 4 +++-
  677. packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java | 38 ++++++++++++++++++++++++++++++++++++--
  678. services/core/java/com/android/server/BluetoothManagerService.java | 47 +++++++++++++++++++++++++++++++----------------
  679. services/core/java/com/android/server/LockSettingsService.java | 10 ++++++++--
  680. 9 files changed, 99 insertions(+), 23 deletions(-)
  681. dragon@Raja:~/lin/frameworks/base$ git push --set-upstream lin test
  682. Username for 'https://github.com': Dragon-oniv
  683. Password for 'https://Dragon-oniv@github.com':
  684. Counting objects: 41, done.
  685. Delta compression using up to 2 threads.
  686. Compressing objects: 100% (35/35), done.
  687. Writing objects: 100% (41/41), 6.30 KiB | 0 bytes/s, done.
  688. Total 41 (delta 30), reused 0 (delta 0)
  689. remote: Resolving deltas: 100% (30/30), completed with 25 local objects.
  690. To https://github.com/Dragon-oniv/android_frameworks_base
  691. 1cd6110..1d2603f test -> test
  692. Branch test set up to track remote branch test from lin.
  693. dragon@Raja:~/lin/frameworks/base$ cd ..
  694. dragon@Raja:~/lin/frameworks$ cd ..
  695. dragon@Raja:~/lin$ repopick 161873
  696. Applying change number 161873...
  697. --> Subject: "OMS7-N: Support tagging resources as OK to overlay [1/11]"
  698. --> Project path: frameworks/base
  699. --> Change number: 161873 (Patch Set 161873)
  700. ['git fetch github', u'refs/changes/73/161873/12']
  701. From git://github.com/LineageOS/android_frameworks_base
  702. * branch refs/changes/73/161873/12 -> FETCH_HEAD
  703. [test 0513184] OMS7-N: Support tagging resources as OK to overlay [1/11]
  704. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  705. Date: Tue Dec 15 16:08:31 2015 +0100
  706. 7 files changed, 164 insertions(+), 15 deletions(-)
  707.  
  708. dragon@Raja:~/lin$ repopick 161874
  709. Applying change number 161874...
  710. --> Subject: "OMS7-N: Introduce the OverlayManagerService [2/11]"
  711. --> Project path: frameworks/base
  712. --> Change number: 161874 (Patch Set 161874)
  713. ['git fetch github', u'refs/changes/74/161874/12']
  714. remote: Counting objects: 48, done.
  715. remote: Compressing objects: 100% (6/6), done.
  716. remote: Total 48 (delta 32), reused 31 (delta 31), pack-reused 11
  717. Unpacking objects: 100% (48/48), done.
  718. From git://github.com/LineageOS/android_frameworks_base
  719. * branch refs/changes/74/161874/12 -> FETCH_HEAD
  720. [test 54d3c24] OMS7-N: Introduce the OverlayManagerService [2/11]
  721. Author: Mårten Kongstad <marten.kongstad@sonymobile.com>
  722. Date: Tue Dec 15 16:40:23 2015 +0100
  723. 14 files changed, 2882 insertions(+)
  724. create mode 100644 core/java/android/content/om/IOverlayManager.aidl
  725. create mode 100644 core/java/android/content/om/OverlayInfo.aidl
  726. create mode 100644 core/java/android/content/om/OverlayInfo.java
  727. create mode 100644 services/core/java/com/android/server/om/IdmapManager.java
  728. create mode 100644 services/core/java/com/android/server/om/OverlayManagerService.java
  729. create mode 100644 services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
  730. create mode 100644 services/core/java/com/android/server/om/OverlayManagerSettings.java
  731. create mode 100644 services/core/java/com/android/server/om/OverlayManagerShellCommand.java
  732.  
  733. dragon@Raja:~/lin$ repopick 161875
Add Comment
Please, Sign In to add comment
Public Pastes
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!