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

567 Commits

Author SHA1 Message Date
Wink Saville
343c1ad720 am 37677849: am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State. 
* commit '37677849998e6c9a39afe0a730b2f0131a371f3b':
  Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
 2011-04-18 15:28:47 -07:00
Wink Saville
3767784999 am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State. 
* commit '64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
  Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
 2011-04-18 15:24:47 -07:00
Wink Saville
64c42cae44 Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State. 
Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
 2011-04-18 14:55:10 -07:00
Xia Wang
5cde33b7d1 am a4b76ff4: am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 
* commit 'a4b76ff4911538f01e92af2f3fa3f4016ad0e290':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
 2011-04-13 16:05:07 -07:00
Xia Wang
a4b76ff491 am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 
* commit 'd69ec89f5d31064174d79e2e77504814629cffa6':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
 2011-04-13 15:52:39 -07:00
Xia Wang
d69ec89f5d am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 
* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
  Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
 2011-04-13 15:34:29 -07:00
Kenny Root
461fa8b05d resolved conflicts for merge of 18490fb9 to master 
Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37
 2011-04-12 12:51:08 -07:00
Kenny Root
18490fb93e resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp 
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
 2011-04-12 10:27:15 -07:00
Kenny Root
87b3c0dcc4 am 08d9d9a4: Merge "Runtime resource overlay, iteration 1." 
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
  Runtime resource overlay, iteration 1.
 2011-04-11 15:33:19 -07:00
Wink Saville
37e344cbe2 am 1b00dc66: am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 
* commit '1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf':
  Move ProcessedMessage into HierarchicalStateMachine.
 2011-04-11 12:11:14 -07:00
Wink Saville
1b00dc66d4 am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE 
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
  Move ProcessedMessage into HierarchicalStateMachine.
 2011-04-11 12:08:19 -07:00
Wink Saville
d3059487ab Move ProcessedMessage into HierarchicalStateMachine. 
ProcessedMessage is really private to HSM and so moving
it into the HSM class.

Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
 2011-04-11 11:51:28 -07:00
Kenny Root
08d9d9a462 Merge "Runtime resource overlay, iteration 1." 2011-04-11 10:07:15 -07:00
Xia Wang
dddfaa75e7 Fix access point parsing: reset static link property after parsing 
static ip setting
Fix removeConfiguredNetwork: add sleep between remove configured network
and disable wifi

Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97
 2011-04-08 16:31:01 -07:00
Joe Onorato
43a17654cf Remove the deprecated things from Config.java. These haven't been working since before 1.0. 
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
 2011-04-07 19:23:05 -07:00
John Wang
52c858f5f0 am c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE 
* commit 'c343c18376b8fd7d27a07adc5bb617d0260a8cdc':
  Make LinkProperties comparable.
 2011-04-07 12:48:17 -07:00
John Wang
c343c18376 am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE 
* commit '5d6f1167039e22889545212ce18192460f9b503e':
  Make LinkProperties comparable.
 2011-04-07 12:46:18 -07:00
John Wang
4e900091c4 Make LinkProperties comparable. 
Add equals() and hashcode() to LinkProperties and related fields.

Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
 2011-04-07 12:36:56 -07:00
Brad Fitzpatrick
bc20ac85a5 am e511fb33: am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit 'e511fb33d33f0ba83ce437f615fa236f369b5ade':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:28:51 -07:00
Brad Fitzpatrick
37334c0f34 am 8f7aad14: am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit '8f7aad147d790b25bae7301827e070df72690341':
  Avoid crash in system server when mounting container
 2011-04-04 15:28:48 -07:00
Brad Fitzpatrick
e511fb33d3 am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '9b1b64399502af0a08beac3014f2294644753602':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:25:33 -07:00
Brad Fitzpatrick
8f7aad147d am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
 2011-04-04 15:25:21 -07:00
Brad Fitzpatrick
9b1b643995 am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
f7a34b1598 am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
  Avoid crash in system server when mounting container
 2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
2ed7204882 Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 2011-04-04 09:41:10 -07:00
Mattias Niklewski
114f98a753 Always return a valid index from Rfc822Tokenizer.findTokenEnd() 
If an invalid input string ends with a backslash inside a comment
or quoted string, the returned index would be past the end of the
string. In one case this would lead to a runtime exception being
thrown from MultiAutoCompleteTextView.performValidation.

Change-Id: If629372b429716c25cdc25764f088e95d4812d57
 2011-04-04 14:52:35 +02:00
Fredrik Helmer
a20c8ef471 Avoid crash in system server when mounting container 
A race condition when mounting a container in PackageHelper may cause
the system_server to crash (uncaught exception). Calling methods are
prepared to handle null, so return null instead.

Change-Id: I852ee21a2d847e37d81c1b900c27ddf94ef24fcb
 2011-04-04 14:38:24 +02:00
Brian Carlstrom
08065b9f09 Tracking merge of dalvik-dev to master 
git cherry-pick --no-commit  a80febd83c8bf0b6717da2a7136179bdc906a5b7

git cherry-pick --no-commit  5e642b41cf44c5da7afdd95ab3d5e2bdbf7b31dd

git cherry-pick --no-commit  4886db14c9eee4b6fee69bd54c57c5af04709c4c

git cherry-pick --no-commit  560c685e448769904047507b9484ce8111967d7e

git cherry-pick --no-commit  63dde7a2fcfa53dc531558635b64cea613d3cdb4

git cherry-pick --no-commit  74e5cb91060a379d98dd3a333b5f231bfb4f502e

git cherry-pick --no-commit  1cc8c9708b555e2e338b7798d38887a2fefcfea6

git cherry-pick --no-commit  09625a21f5abe0c0db15757f58585d552d62c3d7

git cherry-pick --no-commit  fcb02dfe0f5a2bb7c07e6d6fc69f756a484b5458

git cherry-pick --no-commit  a68cb7fa3ab42854768b8145ff85231663770292

git cherry-pick --no-commit  716beb1c131dd2c6b805d4f681debaa20075010c

git cherry-pick --no-commit  8c29b1097a7afe3a77e27546a56e396f3620a4ec

git cherry-pick --no-commit  9c6a1a55d1c8086c1cc57464eea43725694ff70c

git cherry-pick --no-commit  b14f5ea5c57acdd009ba5b51f1bbe430f3d353b8

Change-Id: I8cc94175441b009e23549762d6baee1dbace4881
 2011-04-01 16:00:23 -07:00
Mårten Kongstad
57f4b77c89 Runtime resource overlay, iteration 1. 
Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.

This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.

This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.

Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db
 2011-04-01 14:12:10 +02:00
Jesse Wilson
112d339673 Fix MemoryFile's output stream to advance. 
Previously it was not useful.

Change-Id: I0bcc06b65bab33a38a0b0148c020509076a51b1c
http://code.google.com/p/android/issues/detail?id=11415
 2011-03-24 18:18:19 -07:00
Eric Rowe
94d76925c2 am 2f97217b: am 22e21da6: am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '2f97217bfca0e89b88498c44a8f0f5ad35091b0a':
  Clean up BT stress tests.
 2011-03-22 19:03:14 -07:00
Vasu Nori
cc1eaf6f7b bug:4090903 allow bindargs on attach database statement 
code incorrectly assumed that certain statements (like ATTACH DATABASE)
will never have bindargs.

Change-Id: I62eddbdf8e15947e8debf5052c7248113a3b9b57
 2011-03-21 16:02:25 -07:00
Eric Rowe
2b1fb45fab Clean up BT stress tests. 
Make ConnectPanReceiver a child of ConnectProfileReceiver, check if a
profile proxy is null before trying to connect.  Change log output in
bluetooth.  Remove some oververbose parameters from test runner. Make
the setup for the tests more consistent (delete pairings, etc).

Most of this work has been done to facilitate the tests created for
trade federation.

Change-Id: I7350d308b5d09c2052e0a3f3308a69c564ba4d74
 2011-03-18 20:13:11 -07:00
Xia Wang
01a111486d am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit 'e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:21:28 -07:00
Xia Wang
e9ba454ad8 Port wi-fi stress test into GB 
DO NOT MERGE

Change-Id: Ia79ba42f956481b945e101ccfb66752915a6688d
 2011-03-16 20:25:09 -07:00
Xia Wang
b28339dc24 am 05ab5caa: am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1 
* commit '05ab5caa80fdea6bba8ec2fa758be8e9c7ad4b3d':
  Add WifiStressTest to Wi-Fi only test suite.
 2011-03-10 16:01:45 -08:00
Xia Wang
4bc5c4a1f5 resolved conflicts for merge of 16cbe575 to honeycomb-mr1 
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
 2011-03-10 15:09:46 -08:00
Gilles Debunne
1e3ac18e7a Empty spans are not considered in text layout/rendering process. 
Bug http://code.google.com/p/android/issues/detail?id=14786

Empty spans are affecting the text before and after them. See the
comment in TextUtils.removeEmptySpans for details.

Change-Id: I40376c32fd56a17efde6219f9b2593e4b4ab1ba1
 2011-03-09 17:17:40 -08:00
Xia Wang
3d58d63b03 Add WifiStressTest to Wi-Fi only test suite. 
Change-Id: Id15ec2e291729b910ee05cef4650efb8d2e1a43c
 2011-03-08 18:25:31 -08:00
satok
decee8d35b Fix a test for system properties in frameworks/base/core 
Change-Id: Id588d63ae4cae8c25b430c4ff7719173dacc70bb
 2011-03-07 11:32:51 -08:00
Jesse Wilson
dfed7c006a Remove deprecated and unused entryEvicted method. 
Change-Id: I30ccf3d798a3ebfc88a1b340efaaacf524d56fae
http://b/3461302
 2011-03-07 09:07:07 -08:00
Jesse Wilson
27f4bd7a47 Merge "Remove deprecated and unused entryEvicted method." 2011-03-07 08:47:43 -08:00
Xia Wang
7d83f6020c am 928ec5e0: Merge "Modify connectivity manager test suite so that it can be run on Wi-Fi only device." into honeycomb 
* commit '928ec5e021162fe371da8bdac7f5bb2c854b1aa1':
  Modify connectivity manager test suite so that it can be run on Wi-Fi only device.
 2011-03-05 09:25:30 -08:00
Xia Wang
b97435c94f Modify connectivity manager test suite so that it can be run on Wi-Fi 
only device.

DO NOT MERGE

bug id: 3511242

Change-Id: I7dc6d30793cf679b53af571f58b7405ab9e33299
 2011-03-03 18:46:24 -08:00
satok
656f7a729f Add a test for persist properties settings 
Change-Id: I7bf70104a8cadc739a79d3d855d276628655883c
 2011-03-03 17:42:40 -08:00
satok
c91437d38a do not merge: Cherry pick change I878192090 from master. 
A test for system properties

Change-Id: Id28da70b8e333ca83129c2b7b7aed2ddf9adf51c
 2011-03-03 13:54:38 -08:00
Kenny Root
3dee21eb0f Merge "Switch to returnCode for IPackageDeleteObserver" 2011-03-02 08:50:42 -08:00
Fred Quintana
dfa28c3449 Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders." 2011-03-01 12:30:06 -08:00
Irfan Sheriff
2f6409686f Merge "Using AsyncChannel for wifi connectivity" 2011-03-01 11:32:24 -08:00
Fred Quintana
f9f240e3ad Fix a deadlock in AccountManagerService cause by different 
paths of code getting the mCacheLock and DB locks in different
orders.

The philosophy I followed for this was to ensure that the
DatabaseHelper is only ever accessed from within a
synchronized(mCacheLock) block. I also renamed a bunch of
methods to make it easier to know if a given method should
be called from within this synchronized block.

Bug: 3404506
Change-Id: Ia48f95e77b77647d0717f70f1d8364da3719cc13
 2011-03-01 11:23:19 -08:00