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

62198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Monsen
9a77be5dac Fix fix for bug 2816327 
Remove native methods define for ANDROID_INSTRUMENT calls.

Need to that after the native registering is done in CL:
https://android-git.corp.google.com/g/#/c/148917/

Change-Id: Ic91aec54cb052c29aa06aee028cf8023cd69ed15
 2011-11-16 19:59:27 +00:00
Alex Sakhartchouk
5a47181833 Merge "Expand RS vector3 types to vector4." 2011-11-16 10:36:02 -08:00
The Android Open Source Project
5cf2a1399e am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit 'c172688d5e9a1d26e2792297939cbb7bd93acaf2':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-11-16 07:42:14 -08:00
The Android Open Source Project
c172688d5e am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit 'c7403258528a08ab74f7c29277d0c34ba6edc53d':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.
 2011-11-16 07:38:11 -08:00
The Android Open Source Project
c740325852 Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3
 2011-11-16 07:33:59 -08:00
Steve Block
862c2f5275 Merge changes I2c304952,Ic04bbd69,Ibbac2268 
* changes:
  Update Java Bridge test for coercing JavaScript String to Java char in an array
  Add tests for multidimensional arrays in WebView's Java Bridge
  Fix tests for methods returning arrays in WebView's Java Bridge
 2011-11-16 06:30:55 -08:00
Steve Block
286788c3aa Update Java Bridge test for coercing JavaScript String to Java char in an array 
See https://android-git.corp.google.com/g/150052

Bug: 5619677
Change-Id: I2c3049529312b38bd3731dfc79b14edcb8cd6357
 2011-11-16 14:28:24 +00:00
Steve Block
c353abba95 Add tests for multidimensional arrays in WebView's Java Bridge 
Also add a test for objects with a non-numeric length property being passed to
a method expecting an array.

Change-Id: Ic04bbd691c55744472cab9fb732e504997c62434
 2011-11-16 14:28:20 +00:00
Steve Block
908bc4a846 Fix tests for methods returning arrays in WebView's Java Bridge 
Change-Id: Ibbac2268307fbfcff09a2d3b0f841ce420edc416
 2011-11-16 14:26:37 +00:00
Steve Block
45047a11ae Merge "Add tests for invalid and static methods in the WebView's Java Bridge" 2011-11-16 06:24:14 -08:00
Jake Hamby
ac62c901b7 am 0f2dec50: am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 
* commit '0f2dec5033919fab77a2b52bb3cf33cf4975f2c9':
  Fix 3GPP SMS send failure for 7-bit national language tables.
 2011-11-15 20:24:45 -08:00
Bill Gruber
566e594e7e am df1aba0a: am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 
* commit 'df1aba0a9d25a0f9d38593d369ba963dfcd45866':
  IAB Doc Fix: Error in code snippet Bug 5221766
 2011-11-15 20:24:42 -08:00
Adrian Ludwig
0ebffbc66d am 7456cf0a: am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 
* commit '7456cf0a125b47860a43d9915bae69b5ef374703':
  Adding new "Security Best Practices" to the html docs.
 2011-11-15 20:24:38 -08:00
James Dong
0e7d85fa93 am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 
* commit '4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
  Document that release() should be called with onPause() and onStop() for media objects
 2011-11-15 20:19:55 -08:00
Jake Hamby
0f2dec5033 am bd783684: am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 
* commit 'bd7836846c1e5d3610ba6c26686674d429a4316c':
  Fix 3GPP SMS send failure for 7-bit national language tables.
 2011-11-15 20:19:34 -08:00
Bill Gruber
df1aba0a9d am c7b35481: am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 
* commit 'c7b354810e9caebe1d4c79d8a2e756f3c194e68f':
  IAB Doc Fix: Error in code snippet Bug 5221766
 2011-11-15 20:19:33 -08:00
Adrian Ludwig
7456cf0a12 am cbc96549: am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 
* commit 'cbc96549c9c9a0a4f0bc8ccab1c044c71eba303b':
  Adding new "Security Best Practices" to the html docs.
 2011-11-15 20:19:30 -08:00
James Dong
4e72e2bfc2 am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
 2011-11-15 20:16:47 -08:00
Jake Hamby
bd7836846c am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0 
* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
  Fix 3GPP SMS send failure for 7-bit national language tables.
 2011-11-15 20:16:12 -08:00
Bill Gruber
c7b354810e am c3cf16d2: Merge "IAB Doc Fix: Error in code snippet Bug 5221766" into ics-mr0 
* commit 'c3cf16d2b4ae011c3e6408e0fb21f2377669ac4b':
  IAB Doc Fix: Error in code snippet Bug 5221766
 2011-11-15 20:16:02 -08:00
Adrian Ludwig
cbc96549c9 am 0fd69ff4: Merge "Adding new "Security Best Practices" to the html docs." into ics-mr0 
* commit '0fd69ff4b9311c6b5406b769d50c9aa22787b816':
  Adding new "Security Best Practices" to the html docs.
 2011-11-15 20:15:57 -08:00
James Dong
4fdc36e6d6 Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 2011-11-15 20:13:03 -08:00
Adam Powell
ca127baa06 am 868933e0: am 45f05c95: Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 
* commit '868933e0e43faca442bc8d319898201b233cfb94':
  Fix bug 5623642 - Status bar background incompatible with some legacy apps
 2011-11-15 19:56:09 -08:00
Adam Powell
868933e0e4 am 45f05c95: Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 
* commit '45f05c9580739ffe2d665cec50efb0bb57d757ba':
  Fix bug 5623642 - Status bar background incompatible with some legacy apps
 2011-11-15 19:54:04 -08:00
Adam Powell
45f05c9580 Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1 2011-11-15 19:51:56 -08:00
Jeff Brown
221096fdd6 am 4c0e0dd2: am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1 
* commit '4c0e0dd29dcce33e7521b11d01d21d9431f3b264':
  Eliminate hw.keyboards system properties.
 2011-11-15 19:43:35 -08:00
Dianne Hackborn
8e56e1f345 am cbcf8259: am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 
* commit 'cbcf8259697d2cb9025657a88e01cbb84be11d70':
  Whoops, need to acquire lock.
 2011-11-15 19:43:32 -08:00
Jeff Brown
4c0e0dd29d am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1 
* commit '3e7497b4eccd3db1d6ff0ce1f1f2db11f9a8eeef':
  Eliminate hw.keyboards system properties.
 2011-11-15 19:19:04 -08:00
Jeff Brown
3e7497b4ec Merge "Eliminate hw.keyboards system properties." into ics-mr1 2011-11-15 19:17:09 -08:00
The Android Automerger
dd701b84aa merge in ics-mr0-release history after reset to ics-mr0 2011-11-15 19:08:44 -08:00
Dianne Hackborn
cbcf825969 am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1 
* commit 'cdec187a27b2acc34cd4df26b836b83362527d6a':
  Whoops, need to acquire lock.
 2011-11-15 19:06:20 -08:00
Adam Powell
29ea525d18 Fix bug 5623642 - Status bar background incompatible with some legacy apps 
Give some background protection to custom layouts in legacy notifications.

Pre-HC it was extremely common for apps to hardcode text colors in
layouts. Since this can lead to black text on a dark background in
HC/ICS, give these older apps that target SDK < 11 a light gray
background.

Change-Id: Iab3dea4beb9172b2f9a5cae53991cf952d0c8cde
 2011-11-15 19:04:33 -08:00
Dianne Hackborn
cdec187a27 Merge "Whoops, need to acquire lock." into ics-mr1 2011-11-15 19:04:11 -08:00
Jean-Michel Trivi
29270da5f7 am 4978c1a5: am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '4978c1a5b07782d622ca9e3eedd649a5927d226f':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:28:39 -08:00
Mathias Agopian
dff37bc674 am bc1b7f04: am c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1 
* commit 'bc1b7f0481f9bfa0e9feff0b43e48f9f171e0c38':
  rework a bit how we manage EGL extensions
 2011-11-15 18:25:30 -08:00
Jim Miller
953b299d36 am 58c6f1b2: am c57bfa4a: Fix 5581164: Add abbreviated localized date strings 
* commit '58c6f1b2e1528cd14bef94ae9c5b922b7751309c':
  Fix 5581164: Add abbreviated localized date strings
 2011-11-15 18:25:12 -08:00
Jim Miller
057d48147a am 8622fb34: am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 
* commit '8622fb34769dc257a319ce8e7dab652312d6c049':
  Fix 5581164: Use abbreviated day in lockscreen
 2011-11-15 18:25:08 -08:00
Jean-Michel Trivi
4978c1a5b0 am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '0ddb0143895b816d4ff5c174b346390e07f26556':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:21:44 -08:00
Jean-Michel Trivi
0ddb014389 Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 2011-11-15 18:19:34 -08:00
Mathias Agopian
bc1b7f0481 am c0fa2a3b: Merge "rework a bit how we manage EGL extensions" into ics-mr1 
* commit 'c0fa2a3bce40d52c0f1cccd87f8b0816a6faa6a7':
  rework a bit how we manage EGL extensions
 2011-11-15 18:15:18 -08:00
Mathias Agopian
c0fa2a3bce Merge "rework a bit how we manage EGL extensions" into ics-mr1 2011-11-15 18:12:00 -08:00
James Dong
89ca6983eb Document that release() should be called with onPause() and onStop() for media objects 
Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug: 5616833
 2011-11-15 18:08:06 -08:00
Jeff Brown
1e08fe90df Eliminate hw.keyboards system properties. 
Stop using system properties to publish information about
the key character map path.  Instead, we can retrieve it
on demand by asking the window manager.

It was possible to exhaust the supply of system properties
when repeatedly adding and removing input devices.

Bug: 5532806
Change-Id: Idd361a24ad7db2edc185c8546db7fb05f9c28669
 2011-11-15 18:00:10 -08:00
Jean-Michel Trivi
e7edc86853 Fix 5623252 unlink to death of audio focus client early 
When removing an entry in the audio focus stack, don't wait for
 this object's finalizer to unlink to the death of the associated
 client, and unlink right away.
The FocusStackEntry.unlinkToDeath() method is made safe to call
 by catching the exception it can throw inside its body.

Change-Id: Id347a933d72dcb41531adff2854fb00277032cc9
 2011-11-15 17:41:05 -08:00
Steven Ross
f6cf6de27a Merge "No blackscreen when dialog is showing fixes 5511992" 2011-11-15 17:18:39 -08:00
Jim Miller
58c6f1b2e1 am c57bfa4a: Fix 5581164: Add abbreviated localized date strings 
* commit 'c57bfa4a4bf4c810b5c663df17443463d8192e8f':
  Fix 5581164: Add abbreviated localized date strings
 2011-11-15 16:18:32 -08:00
Dianne Hackborn
7aa6d31240 Whoops, need to acquire lock. 
Also increase time between reports to try to reduce the amount
of redundant spam we get.

Change-Id: Iedd7d743826fffa62ee431073cb7dfb49a00cea0
 2011-11-15 16:12:30 -08:00
Jim Miller
c57bfa4a4b Fix 5581164: Add abbreviated localized date strings 
Change-Id: I041eef02a67980d3b5c2f2fa12eae717c26e35be
 2011-11-15 16:06:37 -08:00
Jim Miller
8622fb3476 am 34a62348: Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 
* commit '34a62348be92034a9fb7582e51754224785568dc':
  Fix 5581164: Use abbreviated day in lockscreen
 2011-11-15 15:44:17 -08:00
Jim Miller
34a62348be Merge "Fix 5581164: Use abbreviated day in lockscreen" into ics-mr1 2011-11-15 15:42:20 -08:00