Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,276 Commits 3 Branches 0 Tags
f5c178bdd3fcfe261ea43cbeef5c325a615af0e1
Commit Graph

161276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
f5c178bdd3 am 6cb68b46: am 8f438e4c: Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev 
* commit '6cb68b4637db7cf59e0278d532a1160ff6adc71e':
  Remove Holo fast scroll preview from Material overlay themes
 2014-10-02 13:38:32 +00:00
Dianne Hackborn
7cf6cac507 am 03e173ed: am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '03e173edce42a5ae0de8a7718330d83664a84a9e':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 13:38:23 +00:00
Erik Pasternak
c7cbbe8e82 am d68362b9: am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'd68362b962be2237418a1a10ebec7a2f75b9b267':
  Implement auto-sleep functionality.
 2014-10-02 13:38:16 +00:00
Jeff Sharkey
2f370e289f am 67c96fd7: am b6ea4676: am 3a14bc84: am f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev 
* commit '67c96fd710e504f6c9763ee02a60bb94b217b553':
  Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
 2014-10-02 13:38:10 +00:00
Alan Viverette
52bab6e722 am 3c062db9: am a5ecdbb1: Merge "Manage pressed state during drag-to-open" into lmp-mr1-dev 
* commit '3c062db99406f083f8c3529bcc56d042b9cb06b0':
  Manage pressed state during drag-to-open
 2014-10-02 13:37:56 +00:00
Dianne Hackborn
0c709a0c0c am f96d125c: am 84402777: am 9a4afb3f: am c3e7f87b: Merge "Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build." into lmp-dev 
* commit 'f96d125c569e181cb22583f295146250d58ec196':
  Fix issue #17740687: Device does not boot after flashing LMP dev TOT(1478825) build.
 2014-10-02 13:37:51 +00:00
ztenghui
79ef48239d am 3fb45865: am 5f243860: am 9ad17521: am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into lmp-dev 
* commit '3fb458653e50e350e9e377d071cb79573d531748':
  + correcting shadow visual appearance (b/17610926)
 2014-10-02 13:37:47 +00:00
Svetoslav
893a15d1e4 am 0671790c: am c088ecc3: am 304a3528: am d35b072d: Merge "Fix accessiblity introspection from the shell user regression." into lmp-dev 
* commit '0671790c2895865ff0cc7780027427d1a9b95667':
  Fix accessiblity introspection from the shell user regression.
 2014-10-02 13:37:37 +00:00
Dianne Hackborn
ef2bc5ccd4 am def99c9d: am 51bd2041: am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev 
* commit 'def99c9da6c47628ebe2b731387d98a79e63acdf':
  Revert white space changes.
 2014-10-02 13:37:33 +00:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
Stephen Hines
f08384c763 am 25a8e43b: am 7d92ae6d: am 5b3be618: am 70de9c0d: Merge "include direct.h for _mkdir" into lmp-dev 
* commit '25a8e43b13e719ff97edd174f8b1ed175e6f91b0':
  include direct.h for _mkdir
 2014-10-02 12:41:58 +00:00
Winson Chung
594d2a5690 am 7f54b3a9: am 6b59887e: am f7d4eb52: am 7f76e505: Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev 
* commit '7f54b3a91430a73241b9ba34bfadf74997c495db':
  Fixing invalid check to get component enabled state. (Bug 17679693)
 2014-10-02 12:41:53 +00:00
Hui Shu
0fdb165193 am 724fe35e: am 5f961157: am 888fd710: am 4e0ad44f: Merge "Revert "Remove WebView DRP Setting from Developer Settings"" into lmp-dev 
* commit '724fe35eac0afd885f3a20ebf846f0429303c157':
  Revert "Remove WebView DRP Setting from Developer Settings"
 2014-10-02 12:40:59 +00:00
wsmlby
d8e94409e0 am 49049aef: am 2e7aa675: am 489502cf: am 7e1ae00c: Merge "Throw error when no intent can be found" into lmp-dev 
* commit '49049aef19f001c6d671a10a3785473e49c056eb':
  Throw error when no intent can be found
 2014-10-02 12:38:49 +00:00
Patrick Tjin
21b0fc91e0 am d104aae8: am cae74017: am f7c59190: am dea847c2: Skip over directories when iterating tombstones 
* commit 'd104aae8154ae182d58fc4c2b85fabbbe152faca':
  Skip over directories when iterating tombstones
 2014-10-02 12:38:44 +00:00
John Spurlock
9ab7d0a736 am a0aa089b: am eac9f30c: am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit 'a0aa089bcf8358f93c4eef33cfe409238ccecd39':
  Doze: Route volume keys to music only while pulsing.
 2014-10-02 12:38:40 +00:00
Winson Chung
7716f1b609 am 98391728: am 0dad6a07: am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to ho 
* commit '983917288d1d6ea0ade9229740ea5bac0b8b2887':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-02 12:38:36 +00:00
Andreas Gampe
eaa863a64e am dc12e109: am 7569294e: am 0a5f518e: am bf417b4d: Merge "Frameworks/base: Update to preloaded-classes" into lmp-dev 
* commit 'dc12e1092e7216a9ed9295afc2fd3f235c2367bb':
  Frameworks/base: Update to preloaded-classes
 2014-10-02 12:38:31 +00:00
John Reck
2b16483ae6 am 3b2f6701: am d644facf: am f408656a: am 8786a962: Merge "Re-allow suppressing onDetachedFromWindow" into lmp-dev 
* commit '3b2f670187fde9079a1f9eaee92415b6a886611f':
  Re-allow suppressing onDetachedFromWindow
 2014-10-02 12:38:26 +00:00
Adam Powell
e18d68d6ab am 4e789dbf: am 8628387c: am b226d295: am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev 
* commit '4e789dbff0bc4d9c259a33d6e8ea595c0f4d5f35':
  Revert "Fix issue with using locally defined attrs in a shared lib"
 2014-10-02 12:38:21 +00:00
Hui Shu
30c284fc46 am 03e73745: am 7ce8d27f: am 9cd616e0: am aee5c9e7: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '03e73745c69637efb806e174109410b0192536e7':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:38:15 +00:00
kmccormick
e0a4bc6182 am 51086dac: am ab7104f9: am af0dca00: am 04e50c47: am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit '51086dac0f143cf9f0999dafde0f71853da2d784':
  Doc update: Update preprod (staging) instructions.
 2014-10-02 12:38:11 +00:00
Ihab Awad
8620976eb9 am f6707f04: am 8f0356d8: Merge "resolved conflicts for merge of ead63f02 to lmp-mr1-dev" into lmp-mr1-dev 
* commit 'f6707f04bb81d916f3e6e07f596e050996ea3c31':
  Refine implementation of GSM conferences (1/3)
 2014-10-02 12:37:56 +00:00
ztenghui
043c4b3502 am 51ec33bb: am 2298938c: Merge "More test cases from UX team for AVD." into lmp-mr1-dev 
* commit '51ec33bbdf6aa533ae4c1e5f0407e8a10e3d212f':
  More test cases from UX team for AVD.
 2014-10-02 12:37:51 +00:00
Andreas Gampe
5e77475b5d am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '152d9aae631381ea28f5701168d372a1486a7502':
  Frameworks/base: Fix more aapt issues
 2014-10-02 12:31:16 +00:00
Neil Fuller
ee665151a4 am 0c1faf43: Merge "Switch from FloatMath -> Math and Math.hypot where possible" 
* commit '0c1faf43aecadc37b78c4ad6cb669eb351d21385':
  Switch from FloatMath -> Math and Math.hypot where possible
 2014-10-02 10:18:29 +00:00
Neil Fuller
0c1faf43ae Merge "Switch from FloatMath -> Math and Math.hypot where possible" 2014-10-02 10:14:19 +00:00
Andreas Gampe
152d9aae63 am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '316296511bf12c4e14dfb6f54731d1a515114abf':
  Frameworks/base: Fix more aapt issues
 2014-10-02 07:01:55 +00:00
Andreas Gampe
316296511b Merge "Frameworks/base: Fix more aapt issues" 2014-10-02 06:58:39 +00:00
Andreas Gampe
87332a7109 resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
 2014-10-01 23:26:06 -07:00
Andreas Gampe
b8dc7bc582 Frameworks/base: Fix more aapt issues 
Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
 2014-10-01 20:42:00 -07:00
Alan Viverette
6cb68b4637 am 8f438e4c: Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev 
* commit '8f438e4ccd19da343c37593ec61ba1887a7c304e':
  Remove Holo fast scroll preview from Material overlay themes
 2014-10-02 00:59:50 +00:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +00:00
Selim Cinek
6ebab792d2 am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '1e5e35ef626d2a73cf823e75fcbb67af3398b1ff':
  Adapting translation length for a string in a dialog
 2014-10-02 00:58:46 +00:00
Baligh Uddin
8c95b359da am 940d3dd0: (-s ours) am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '940d3dd05554db4627f0704be4f73fb1a27ce479':
  Import translations. DO NOT MERGE
 2014-10-02 00:58:42 +00:00
John Spurlock
b3a90ee245 am 7e67011f: am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit '7e67011f15dd3c7df3200358d950cf4e4429db2c':
  Zen: Fix new event category check.
 2014-10-02 00:58:36 +00:00
Baligh Uddin
5729f6c0de am 861978f7: (-s ours) am b8cbdcb6: (-s ours) am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '861978f7de8b95010fecfb76b15f1d81f4f5c3a8':
  Import translations. DO NOT MERGE
 2014-10-02 00:58:32 +00:00
Alan Viverette
8f438e4ccd Merge "Remove Holo fast scroll preview from Material overlay themes" into lmp-mr1-dev 2014-10-02 00:55:27 +00:00
Dianne Hackborn
03e173edce am ded96310: am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'ded96310cfd24b3cea21a814edf8629f592c7014':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:37:54 +00:00
Dianne Hackborn
ded96310cf am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '796d6eced1e23217914e639da45d9371baf8a5b0':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:32:02 +00:00
Dianne Hackborn
796d6eced1 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:27:48 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
d68362b962 am c6646b0c: am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit 'c6646b0cb4ca34f1f0842b94367a5b34191f9976':
  Implement auto-sleep functionality.
 2014-10-02 00:14:41 +00:00
Erik Pasternak
c6646b0cb4 am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '739bf81dd130957c9bc09abc4e25732af2d675c0':
  Implement auto-sleep functionality.
 2014-10-02 00:09:47 +00:00
Erik Pasternak
739bf81dd1 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:01 +00:00
Jeff Sharkey
67c96fd710 am b6ea4676: am 3a14bc84: am f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev 
* commit 'b6ea4676aa108e13c5f82361148796d285b7b5c9':
  Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
 2014-10-02 00:01:14 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager 
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
 2014-10-01 16:58:56 -07:00
Alan Viverette
d3cf7420ee Remove Holo fast scroll preview from Material overlay themes 
These were supposed to be removed when we updated the fast scroll
preview background for Material.

BUG: 17765143
Change-Id: I596398ea2e105fef9c92545d16955e684d980f73
 2014-10-01 16:54:19 -07:00
Jeff Sharkey
b6ea4676aa am 3a14bc84: am f178591f: Merge "Give audio GID to MANAGE_VOICE_KEYPHRASES apps." into lmp-dev 
* commit '3a14bc8430dbdafbf8d2484b0b4396034f78ae48':
  Give audio GID to MANAGE_VOICE_KEYPHRASES apps.
 2014-10-01 23:54:04 +00:00