drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,198 Commits 1 Branch 0 Tags
Commit Graph

85198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
599023f639 am b11b9fc9: Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 
* commit 'b11b9fc9972ba0ae7f3d13984c5c61a8d89ca142':
  A new broadcast action which is sent when profile changes
 2012-09-12 16:13:50 -07:00
Makoto Onuki
b11b9fc997 Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 2012-09-12 16:11:13 -07:00
Raph Levien
fde5772640 am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev 
* commit 'eb1f5349f8ac51e12e48497bbd2ae37badfe5009':
  Fix for b7155617 race condition in TextLayoutCache.cpp
 2012-09-12 15:46:43 -07:00
Raph Levien
eb1f5349f8 Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev 2012-09-12 15:44:58 -07:00
Raph Levien
13ba4e478d Fix for b7155617 race condition in TextLayoutCache.cpp 
There was the possibility for a race between clearing the caches and
using fonts. This patch simply protects both under the same mLock held
by the TextLayoutCache object.

Change-Id: Ib366e16a9a9ba702a46bc078d1bc0602713991e5
 2012-09-12 15:15:51 -07:00
rich cannings
e88d69508b am 4a86019a: Temporarily turn off package verification 
* commit '4a86019aeeed8420c809b94ac07edeff86972108':
  Temporarily turn off package verification
 2012-09-12 15:04:33 -07:00
rich cannings
4a86019aee Temporarily turn off package verification 
Bug: 7152858
Change-Id: Ic3b1900e486224dafcf3cce5db13e5f795650b51
 2012-09-12 14:45:58 -07:00
Selim Gurun
2d449a482c am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 
* commit 'f4fd2eb5ee425a29aa2bed4c92ea21ac5fd7fd69':
  Minor update to addjavascriptinterface documentation
 2012-09-12 13:42:49 -07:00
Selim Gurun
f4fd2eb5ee Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 2012-09-12 13:41:09 -07:00
Selim Gurun
b4c02e6ffd Minor update to addjavascriptinterface documentation 
Change-Id: I67525673e3d061e00fbe8989c08050ad84e78920
 2012-09-12 13:36:21 -07:00
Fabrice Di Meglio
465858e779 am 2cd35662: Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev 
* commit '2cd35662caa824846555a3be595b7fa69337fa31':
  Fix SeekBar when in RTL layout direction
 2012-09-12 13:31:13 -07:00
Fabrice Di Meglio
47e39a9f61 am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 
* commit '8872465709d336083a908cb79d08661c6658265b':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
 2012-09-12 13:29:27 -07:00
Fabrice Di Meglio
2cd35662ca Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev 2012-09-12 13:28:17 -07:00
Fabrice Di Meglio
215ce60a40 am b9674640: Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 
* commit 'b967464049d7a75face9237a89903342c4724f8a':
  Enforce encapsulation for MarginLayoutParams startMargin and endMargin
 2012-09-12 13:27:37 -07:00
Fabrice Di Meglio
8872465709 Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 2012-09-12 13:26:56 -07:00
Fabrice Di Meglio
b967464049 Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 2012-09-12 13:25:22 -07:00
Selim Gurun
6e28f1aacf am 4f8da32f: Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 
* commit '4f8da32ffaf7aaf1f670e74caa7cd8a70ddb63c6':
  Make JavascriptInterface annotation public.
 2012-09-12 12:50:47 -07:00
Selim Gurun
4f8da32ffa Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 2012-09-12 12:48:32 -07:00
Brian Carlstrom
2e96c791e2 am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev 
* commit '743115ffcd5f7b04d8b485bbfc5440216c3aaf4f':
  Tracking upgrade to bouncycastle 1.47
 2012-09-12 11:24:45 -07:00
Brian Carlstrom
743115ffcd Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev 2012-09-12 11:20:37 -07:00
Elliott Hughes
478eb3a65a am 6cfba16c: am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit '6cfba16c25d04ae13c5b06d53bb495571bd83e95':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:11:03 -07:00
Elliott Hughes
6cfba16c25 am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit '40ad466e4e9669b43b72c4736ec9e8e27ddb5cfc':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:08:45 -07:00
Elliott Hughes
40ad466e4e am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit '4c686dad83b6712e0e1abab6aba9c7bb683000b2':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:06:56 -07:00
Elliott Hughes
4c686dad83 am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 11:04:45 -07:00
Scott Main
460486bfb8 am c4091423: am 53d1864c: am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev 
* commit 'c4091423d81e039043a754b2588b4fd29a8774cf':
  fix another link in the style doc
 2012-09-12 10:48:12 -07:00
Scott Main
c4091423d8 am 53d1864c: am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev 
* commit '53d1864c100ba6562b3077d662a063356b9584ce':
  fix another link in the style doc
 2012-09-12 10:46:00 -07:00
Scott Main
53d1864c10 am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev 
* commit '8dc0ff07c9713945b0075dd1010057a47cb8c40b':
  fix another link in the style doc
 2012-09-12 10:43:57 -07:00
Scott Main
8dc0ff07c9 Merge "fix another link in the style doc" into jb-dev 2012-09-12 10:41:20 -07:00
Scott Main
816518fa59 fix another link in the style doc 
Change-Id: Icd40456ab32232eacc6fa3acdd86ff78aa03e3aa
 2012-09-12 10:40:29 -07:00
Marco Nelissen
f903c8d23f am a962d749: Merge "EffectsTest enhancements" into jb-mr1-dev 
* commit 'a962d749ede478602ebff82d9dfab0482d5c6b54':
  EffectsTest enhancements
 2012-09-12 10:28:35 -07:00
Marco Nelissen
a962d749ed Merge "EffectsTest enhancements" into jb-mr1-dev 2012-09-12 10:25:53 -07:00
Scott Main
c42abbc3af am 04827912: am eb0b6e27: am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev 
* commit '048279126f3cbe62cab10007d58e2c751aaf20d0':
  fix links to style and themes source files
 2012-09-12 10:15:10 -07:00
Elliott Hughes
cceed1dfe1 Merge "Include <sys/socket.h> instead of <linux/socket.h>." 2012-09-12 10:13:28 -07:00
Scott Main
048279126f am eb0b6e27: am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev 
* commit 'eb0b6e272f63d7685bc147107c87b5d6235c07e5':
  fix links to style and themes source files
 2012-09-12 10:13:25 -07:00
Scott Main
eb0b6e272f am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev 
* commit '94b2b5efa017138663e00e23e138333149641023':
  fix links to style and themes source files
 2012-09-12 10:11:00 -07:00
Scott Main
94b2b5efa0 Merge "fix links to style and themes source files" into jb-dev 2012-09-12 10:08:36 -07:00
Scott Main
600a75c31f fix links to style and themes source files 
Change-Id: I49759c689c3d345be014c7a252e266d7529af230
 2012-09-12 10:05:38 -07:00
Brian Carlstrom
0efca17105 Tracking upgrade to bouncycastle 1.47 
Change-Id: I4a3c508c5e65dd46a2df22935b5351092550fad5
 2012-09-12 10:01:00 -07:00
Kristian Monsen
5710a2f126 am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 
* commit 'bd0fe8783407bc760b8e9a9952cb96a600d26ea9':
  Deprecating methods (and a constant) for JB MR1
 2012-09-12 09:37:13 -07:00
Kristian Monsen
bd0fe87834 Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 2012-09-12 09:34:37 -07:00
Selim Gurun
e91d5bee24 Make JavascriptInterface annotation public. 
Bug: 7073422

This change makes @JavascriptInterface public and it requires
using this annotation to allow javascript access to public java
methods for API level JELLY_BEAN_MR1 and above. The behavior
does not change for API levels JELLY_BEAN and below.

Change-Id: I4108b17cf71b9ac273d7b61b1c8f7f5581e922ee
 2012-09-12 08:04:26 -07:00
The Android Open Source Project
da88c8b010 am 568e3ebb: am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '568e3ebb5e7814fb68179a9755a686a0e1deec70':
  Fix notification gestures.
  Single finger notification expansion.
 2012-09-12 07:53:59 -07:00
The Android Open Source Project
568e3ebb5e am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '4b0764eef22e3244d3f45fbda1e093ff11986f5f':
  Fix notification gestures.
  Single finger notification expansion.
 2012-09-12 07:51:44 -07:00
The Android Open Source Project
4b0764eef2 Reconcile with jb-mr0-release - do not merge 
Change-Id: I41a4b710eb0846eaf276f21b75c8d9bb2f76c977
 2012-09-12 07:49:49 -07:00
The Android Open Source Project
2b2b53c713 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ib11ce3b2ad34e79b32e10fff1a91eec6347ad774
 2012-09-12 07:40:36 -07:00
The Android Automerger
0240397263 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-12 06:59:45 -07:00
Jeff Sharkey
81eb7640b1 am 8b29d63d: Merge "Include user identifier in external storage paths." into jb-mr1-dev 
* commit '8b29d63d0857337057db707549ef1faed39792fd':
  Include user identifier in external storage paths.
 2012-09-11 23:38:16 -07:00
Jeff Sharkey
8b29d63d08 Merge "Include user identifier in external storage paths." into jb-mr1-dev 2012-09-11 23:36:50 -07:00
Jeff Sharkey
b049e212ab Include user identifier in external storage paths. 
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

Since Environment is created before Zygote forks, we need to update
its internal paths after each process launches.

Bug: 7131382
Change-Id: I6f8c6971f2a8edfb415c14cb4ed05ff97e587a21
 2012-09-11 23:11:14 -07:00
Daniel Sandler
de3debd9f5 Fix notification gestures. 
Broken by recent changes to ScaleGestureDetector, which we
were using incorrectly.

Change-Id: Ie5a7981cc14873d34de9041f59b5de442c948a61
 2012-09-11 22:20:12 -07:00