Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,915 Commits 3 Branches 0 Tags
e968c87fa766ea668e319aa828f419fe0dcfd0db
Commit Graph

206915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
e968c87fa7 am 570a2363: am a8431e8c: am bfd62580: am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev 
* commit '570a2363c8f80e94fbd6433e0c7f655a7350ad04':
  Ensure ripple mask is drawn at correct position
 2015-08-11 20:02:30 +00:00
Alan Viverette
570a2363c8 am a8431e8c: am bfd62580: am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev 
* commit 'a8431e8c37df24564114dc6840a710fd45b39091':
  Ensure ripple mask is drawn at correct position
 2015-08-11 19:55:05 +00:00
Alan Viverette
a8431e8c37 am bfd62580: am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev 
* commit 'bfd62580df499099060847c606ee6fc99a5abc21':
  Ensure ripple mask is drawn at correct position
 2015-08-11 19:47:56 +00:00
Alan Viverette
bfd62580df am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev 
* commit '11104791c71e0140f1d37b711ca929939a85b77c':
  Ensure ripple mask is drawn at correct position
 2015-08-11 19:41:35 +00:00
Alan Viverette
11104791c7 Merge "Ensure ripple mask is drawn at correct position" into mnc-dev 2015-08-11 19:33:55 +00:00
Alan Viverette
3e384531be am 1743988c: am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit '1743988cd7647af8c64c961d4ca5e9d4b4b7bc00':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:53:13 +00:00
Alan Viverette
1743988cd7 am 6c3a468c: am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit '6c3a468cf32926d3ad990fc7bc44e8b04615a7f2':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:47:19 +00:00
Alan Viverette
6c3a468cf3 am e720297f: am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit 'e720297fd89d39325a34f0d8f54e55971aec7269':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:38:21 +00:00
Alan Viverette
e720297fd8 am b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 
* commit 'b4eb06402fba62f94bb16cbe433fe99a8df7cb18':
  Avoid use-after-free race condition when rebasing theme
 2015-08-11 18:31:48 +00:00
Alan Viverette
bac9769146 Ensure ripple mask is drawn at correct position 
Bug: 22911708
Change-Id: Icdbe1f8a66d5e35eb25aa973c94f5870896cc1f8
 2015-08-11 14:25:45 -04:00
Alan Viverette
b4eb06402f Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev 2015-08-11 18:24:04 +00:00
Daniel Sandler
5e3e4f9b58 am 49ae8f2e: am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit '49ae8f2ef20843514e63aff5378dbdc0644ee0cb':
  Crash apps with bad notification icons.
 2015-08-11 14:44:10 +00:00
Daniel Sandler
49ae8f2ef2 am d7468176: am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit 'd74681763c4ca9047b006efab5098a87e302f479':
  Crash apps with bad notification icons.
 2015-08-11 14:37:56 +00:00
Daniel Sandler
d74681763c am 5bba07eb: am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit '5bba07eb01d923beea173712295d6b10c9762400':
  Crash apps with bad notification icons.
 2015-08-11 14:29:39 +00:00
Alan Viverette
c12ec70def Avoid use-after-free race condition when rebasing theme 
... by never rebasing the theme. We don't need to do this unless the
system theme is configuration-dependent, which it is not currently.

Bug: 22943781
Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
 2015-08-11 10:26:08 -04:00
Daniel Sandler
5bba07eb01 am ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev 
* commit 'ad7719dea4e8fd34854e4dcc918fc593c4416d82':
  Crash apps with bad notification icons.
 2015-08-11 14:22:12 +00:00
Daniel Sandler
ad7719dea4 Merge "Crash apps with bad notification icons." into mnc-dev 2015-08-11 14:17:45 +00:00
Jason Monk
1ef95dc59c am 413493b5: am c7789c3e: am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '413493b5010d3cbe0900c21510801f23c45a9fc8':
  Add setting to disable camera gesture
 2015-08-11 14:12:05 +00:00
Jason Monk
413493b501 am c7789c3e: am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit 'c7789c3ecb553d316f158cf699426ed5f965e591':
  Add setting to disable camera gesture
 2015-08-11 14:08:08 +00:00
Jason Monk
c7789c3ecb am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '36052477465f51a4c690e4e8dfb290fb15ce88b0':
  Add setting to disable camera gesture
 2015-08-11 14:02:42 +00:00
Jason Monk
3605247746 Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:53 +00:00
Esteban Talavera
6f4de12870 am 84bd2172: am 8e85fdfe: am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '84bd2172ea42dc6681bcf4f96e19a3f5fd928b41':
  Update setApplicationRestrictions documentation
 2015-08-11 10:30:33 +00:00
Esteban Talavera
84bd2172ea am 8e85fdfe: am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '8e85fdfe4622f69bb8ca833728144e1925d02ad2':
  Update setApplicationRestrictions documentation
 2015-08-11 10:24:19 +00:00
Esteban Talavera
8e85fdfe46 am 467951ee: am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '467951eebbc6525b40a6b569c401849fe2394c1d':
  Update setApplicationRestrictions documentation
 2015-08-11 10:16:36 +00:00
Esteban Talavera
467951eebb am 4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev 
* commit '4dbb37ae95bdf60d230777c6a5e8d53b932e9d40':
  Update setApplicationRestrictions documentation
 2015-08-11 10:08:51 +00:00
Esteban Talavera
4dbb37ae95 Merge "Update setApplicationRestrictions documentation" into mnc-dev 2015-08-11 09:40:57 +00:00
Andreas Gampe
d38110bdcd am 1be6e1c7: am 9502cc54: am d0669693: am b08c24a3: Frameworks/base: Disable Clang in core/jni 
* commit '1be6e1c7643859839157534d45677fa20169fd1d':
  Frameworks/base: Disable Clang in core/jni
 2015-08-11 06:56:19 +00:00
Andreas Gampe
1be6e1c764 am 9502cc54: am d0669693: am b08c24a3: Frameworks/base: Disable Clang in core/jni 
* commit '9502cc548b0000bc192fcf597596e109f3d93f02':
  Frameworks/base: Disable Clang in core/jni
 2015-08-11 06:49:27 +00:00
Andreas Gampe
9502cc548b am d0669693: am b08c24a3: Frameworks/base: Disable Clang in core/jni 
* commit 'd06696939b922a7849c90e5421e2100340a8e913':
  Frameworks/base: Disable Clang in core/jni
 2015-08-11 06:42:11 +00:00
Andreas Gampe
d06696939b am b08c24a3: Frameworks/base: Disable Clang in core/jni 
* commit 'b08c24a3e4f5362bbddc3735802e844e1992cd46':
  Frameworks/base: Disable Clang in core/jni
 2015-08-11 06:35:42 +00:00
Andreas Gampe
b08c24a3e4 Frameworks/base: Disable Clang in core/jni 
thread_local does not work with Clang at the moment.

Bug: 22414716
Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26
(cherry picked from commit 2bc67a1b5f)
 2015-08-11 06:18:49 +00:00
Winson Chung
641363e894 am bfa04f49: am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'bfa04f4998956e510a935f6514298dcd3d122264':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 03:00:44 +00:00
Winson Chung
bfa04f4998 am b12ca163: am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'b12ca1635a81c5ab6b1d4dfa5cdf8e01612f8ca3':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:53:53 +00:00
Winson Chung
b12ca1635a am bc58c945: am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'bc58c9453fd4f647a3382608f8de8e557854758d':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:47:48 +00:00
Winson Chung
bc58c9453f am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 
* commit 'c00b1067a05116548a0883e1400a1c4715078797':
  Pushing the startActivity before the calls to remove task.
 2015-08-11 02:40:05 +00:00
Winson Chung
c00b1067a0 Merge "Pushing the startActivity before the calls to remove task." into mnc-dev 2015-08-11 02:33:15 +00:00
Jorim Jaggi
858a929f6e am 231bddea: am 1785c097: am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev 
* commit '231bddea314003579718f4214bd0bc535c289b05':
  Don't show fingerprint cancellation messages in keyguard
 2015-08-11 01:58:24 +00:00
Jorim Jaggi
231bddea31 am 1785c097: am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev 
* commit '1785c097ccaf9732902c2245fc63c4d044565ffa':
  Don't show fingerprint cancellation messages in keyguard
 2015-08-11 01:53:44 +00:00
Jorim Jaggi
1785c097cc am 3767d85c: am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev 
* commit '3767d85caac8eec6c7c219de3d0a000fca18ad8b':
  Don't show fingerprint cancellation messages in keyguard
 2015-08-11 01:45:32 +00:00
Jorim Jaggi
3767d85caa am f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev 
* commit 'f8359cfb93e349771388709b160ae1b9d3f880b3':
  Don't show fingerprint cancellation messages in keyguard
 2015-08-11 01:39:43 +00:00
Jorim Jaggi
f8359cfb93 Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev 2015-08-11 01:31:56 +00:00
Dianne Hackborn
b44cdfdd10 am afacdbe1: am 09e77852: am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 
* commit 'afacdbe1e824845917d038a5848ae515d44393bb':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:42:58 +00:00
Dianne Hackborn
afacdbe1e8 am 09e77852: am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 
* commit '09e77852d8c25854894358789807a73c3e79ddf0':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:35:18 +00:00
Dianne Hackborn
09e77852d8 am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 
* commit '5cf89a011932f1af9361e7b713e33ff5c5af3e61':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:28:20 +00:00
Dianne Hackborn
5cf89a0119 am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 
* commit 'b2b020922fb51b88d34a6478209fc232702de318':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog
 2015-08-11 00:19:44 +00:00
Dianne Hackborn
b2b020922f Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev 2015-08-11 00:11:20 +00:00
Matthew Williams
ced03081ef am ae88437d: am 83682890: am 2c8c251e: am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev 
* commit 'ae88437d292f253f2bdea16cbe381e0ae46b15ab':
  DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
 2015-08-10 23:05:27 +00:00
Chris Tate
863676ef7f am d4c0b52e: am 1e05bc6f: am 5ca842ae: am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev 
* commit 'd4c0b52e2a425dbc6e3794aae33595959453e777':
  Fix wifi disable during restore
 2015-08-10 23:05:21 +00:00
Matthew Williams
ae88437d29 am 83682890: am 2c8c251e: am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev 
* commit '83682890190c9a5b73e1742a58c1e017ac418ee2':
  DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED
 2015-08-10 22:59:33 +00:00
Chris Tate
d4c0b52e2a am 1e05bc6f: am 5ca842ae: am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev 
* commit '1e05bc6f77b9e609df598ef0aed20a0ef81848a1':
  Fix wifi disable during restore
 2015-08-10 22:59:28 +00:00