Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 825d8ff56a42908860b99cbd2ffeebcb96b8d2f2
  1. 825d8ff resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp am: 07e590a574 by Marie Janssen · 8 years ago
  2. 07e590a resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp by Marie Janssen · 8 years ago
  3. c816141 resolve merge conflicts of 9cc7ebe to stage-aosp-master by Marie Janssen · 8 years ago
  4. c7fad3b Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d by Ivan Podogov · 8 years ago
  5. 48738f5 Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499 by Ivan Podogov · 8 years ago
  6. a9c92c2 Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9 by Hemant Gupta · 8 years ago
  7. e11c3f6 Merge changes from topic 'HID-Client' am: 8a74d0440c am: 59d63e8b1d by Ivan Podogov · 8 years ago
  8. 91ab2e2 Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 by Ivan Podogov · 8 years ago
  9. 1ee22b7 Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9 by Hemant Gupta · 8 years ago
  10. 59d63e8 Merge changes from topic 'HID-Client' am: 8a74d0440c by Ivan Podogov · 8 years ago
  11. 94e3d3f Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 by Ivan Podogov · 8 years ago
  12. ee469c6 Bluetooth: Add support for HID Device Role am: e88fd4b594 by Hemant Gupta · 8 years ago
  13. 9cc7ebe Merge "Bluetooth: track enabling in dumpsys" by Marie Janssen · 8 years ago
  14. 8a74d04 Merge changes from topic 'HID-Client' by Treehugger Robot · 8 years ago
  15. 5980456 Bluetooth: track enabling in dumpsys by Marie Janssen · 8 years ago
  16. 0afe190 Rename the Bluetooth profile classes for HID Device role. by Ivan Podogov · 8 years ago
  17. e88fd4b Bluetooth: Add support for HID Device Role by Hemant Gupta · 10 years ago
  18. b5a5a51 Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 2c29250b44" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  19. 140ac4e Merge "Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff am: 171fa83224" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  20. 7aa7ee7 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff by Charles He · 8 years ago
  21. 2518cfc Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: 0881d980ad" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  22. cc2c824 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a am: 821fdbd3ff by Charles He · 8 years ago
  23. bf9a3b4 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: fdcec75c74" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  24. ac437a2 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 by Charles He · 8 years ago
  25. f2263e3 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 by Charles He · 8 years ago
  26. 78129e3 Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: ccf6c25b3c" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  27. 35f1af7 Merge "Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 am: e167e6d284" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  28. d4dcbc4 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 by Charles He · 8 years ago
  29. 4c57f6f Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb am: b5f3383589 by Charles He · 8 years ago
  30. 424aa97 Merge "Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 am: 22faa73586" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  31. 5037941 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 by Charles He · 8 years ago
  32. fce4eb6 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 by Charles He · 8 years ago
  33. 2c29250 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a by Charles He · 8 years ago
  34. 171fa83 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a by Charles He · 8 years ago
  35. 0881d98 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 by Charles He · 8 years ago
  36. fdcec75 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 by Charles He · 8 years ago
  37. ccf6c25 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb by Charles He · 8 years ago
  38. e167e6d Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb by Charles He · 8 years ago
  39. 22faa73 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 by Charles He · 8 years ago
  40. 065e387 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 by Charles He · 8 years ago
  41. 04a20f6 Merge "In permission review mode, always request user's consent to toggle BT." am: 895e2d7a40 -s ours am: fd770e1cb8 by Ivan Podogov · 8 years ago
  42. b90fa0a Merge "In permission review mode, always request user's consent to toggle BT." am: 895e2d7a40 -s ours by Ivan Podogov · 8 years ago
  43. 821fdbd Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 by Charles He · 8 years ago
  44. 3ad5df5 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 by Charles He · 8 years ago
  45. b5f3383 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 by Charles He · 8 years ago
  46. 08ea823 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad by Charles He · 8 years ago
  47. fd770e1 Merge "In permission review mode, always request user's consent to toggle BT." by Ivan Podogov · 8 years ago
  48. 596e3a9 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 by Charles He · 8 years ago
  49. b75b025 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc by Charles He · 8 years ago
  50. 835c1bc Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 by Charles He · 8 years ago
  51. 9bc2d6b Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f by Charles He · 8 years ago
  52. b07ddf3 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf by Charles He · 8 years ago
  53. e426dac Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c by Charles He · 8 years ago
  54. c189f23 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 by Charles He · 8 years ago
  55. dd7837c Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 by Charles He · 8 years ago
  56. 0e2e913 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb by Charles He · 8 years ago
  57. 3cc7f6a Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 by Charles He · 8 years ago
  58. 03fa83e Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 by Charles He · 8 years ago
  59. 8bcdab7 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 by Charles He · 8 years ago
  60. 1d84f61 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b by Charles He · 8 years ago
  61. ced5ab1 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 by Charles He · 8 years ago
  62. 6bb6f02 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd by Charles He · 8 years ago
  63. 9a47fa7 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 by Charles He · 8 years ago
  64. 5c74a1e Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad by Charles He · 8 years ago
  65. 0cc0219 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 by Charles He · 8 years ago
  66. e15e0de Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 by Charles He · 8 years ago
  67. e5156ec Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 by Charles He · 8 years ago
  68. 895e2d7 Merge "In permission review mode, always request user's consent to toggle BT." by Ivan Podogov · 8 years ago
  69. f027831 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d by Charles He · 8 years ago
  70. 76ca2da Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f by Charles He · 8 years ago
  71. b64af9b Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 by Charles He · 8 years ago
  72. 00a581f Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d by Charles He · 8 years ago
  73. a1d5997 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b by Charles He · 8 years ago
  74. 6aa436b Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 by Charles He · 8 years ago
  75. d7f2a4b Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 by Charles He · 8 years ago
  76. 133ff4d Prevent writing to FRP partition during factory reset. am: a9437bd1ca by Charles He · 8 years ago
  77. 1422a60 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev by Charles He · 8 years ago
  78. d0339c6 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. by Charles He · 8 years ago
  79. a8484b4 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev by Charles He · 8 years ago
  80. 2ce5c43 Prevent writing to FRP partition during factory reset. am: a9437bd1ca by Charles He · 8 years ago
  81. 63a27d7 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev by Charles He · 8 years ago
  82. 4bd97eb Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev by Charles He · 8 years ago
  83. c052e6c Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 am: 010d0be575 by Martijn Coenen · 8 years ago
  84. 1f8c96c Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 am: 010d0be575 by Martijn Coenen · 8 years ago
  85. 010d0be Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 by Martijn Coenen · 8 years ago
  86. 7705363 Merge "Add (un)linkToDeath support to HwBinder." by Martijn Coenen · 8 years ago
  87. 727f7bf Add (un)linkToDeath support to HwBinder. by Martijn Coenen · 8 years ago
  88. ef5d594 Merge "Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 am: cf33fd7910" into nyc-mr2-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  89. 3659363 Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 by ashutoshj · 8 years ago
  90. b0ff5e51 Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev by Jiaquan He · 8 years ago
  91. c29cd0f Move grid checking into the layout algorithm. am: 26f637b555 by Jiaquan He · 8 years ago
  92. cf33fd7 Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 by ashutoshj · 8 years ago
  93. c87fcb0 Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev by TreeHugger Robot · 8 years ago
  94. 8a3f7c0 Merge "Change the name of the contexthub service." am: fba752e64c by ashutoshj · 8 years ago
  95. fba752e Merge "Change the name of the contexthub service." by ashutoshj · 8 years ago
  96. 5338939 Merge "2D recents: show all close buttons right away" into nyc-mr2-dev by Jiaquan He · 8 years ago
  97. ca0e5564 2D recents: show all close buttons right away am: 8ff7854c4b by Manu Cornet · 8 years ago
  98. fe50c6c Merge "2D Recents: use a slightly darker scrim background" into nyc-mr2-dev by Jiaquan He · 8 years ago
  99. bec5fee 2D Recents: use a slightly darker scrim background am: 48de4e6afe by Manu Cornet · 8 years ago
  100. 3b430f7 Merge "2D recents: show all close buttons right away" into nyc-mr2-dev by Jiaquan He · 8 years ago