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

888 Commits

Author SHA1 Message Date
Kenny Root
bccda0aee3 am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev 
* commit '194da0b8b368ac61b23870224bc0d449ad465bd4':
  Fix AccountManagerServiceTest
 2012-07-31 12:36:35 -07:00
Kenny Root
194da0b8b3 am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev 
* commit 'a39fdd11e80618acc046fff65b6549b5c8b5aa8d':
  Fix AccountManagerServiceTest
 2012-07-31 12:34:30 -07:00
Kenny Root
ae652cc97c Fix AccountManagerServiceTest 
The MockAccountAuthenticatorCache needs to implement the new method.

Bug: 6820670
Change-Id: I5d1cb3aecec63602ae4541cd01ae8e28c8328e5a
 2012-07-31 12:27:32 -07:00
Irfan Sheriff
cba4d38820 Merge "Update WifiManager API" 2012-07-25 12:25:13 -07:00
Irfan Sheriff
88759bbd31 Update WifiManager API 
Use feedback based on NSD to update WifiManager API

Change-Id: I0c1dc74f7e2fa7cd697a995b7194e3e0366d7981
 2012-07-24 13:34:36 -07:00
Fabrice Di Meglio
85d28a0004 Merge "Replace left/right with start/end for Gravity / LayoutParams / Padding" 2012-07-24 11:11:02 -07:00
Jeff Sharkey
eaaf396169 Avoid emitting broken ASCII. 
Bug: 6131887
Change-Id: Iff13573aad8128cc7ae3613ab718c81e6d0862a1
 2012-07-21 12:39:48 -07:00
Fabrice Di Meglio
aac0d4ed02 Replace left/right with start/end for Gravity / LayoutParams / Padding 
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: Id9af5375fb9b0edeae5232c77e52ecd497bd2e67
 2012-07-19 19:21:26 -07:00
Wink Saville
5362f17ff5 Merge commit '1b003ef0' into mit 
* commit '1b003ef0':
  Create telephony-common and mms-common

Change-Id: Ie8876541dbe7f4c933cf7d69910dd204538bc975
 2012-07-11 18:15:50 -07:00
Wink Saville
a639b311e9 Create telephony-common and mms-common 
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
 2012-07-11 16:02:08 -07:00
Wink Saville
095c58b73a Enhance StateMachine Quitting and logging support. DO NOT MERGE 
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.

bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7

Conflicts:

	services/java/com/android/server/NsdService.java
 2012-07-02 10:57:11 -07:00
Kenny Root
5293d0cb2e Merge "Packages for PackageManagerService tests" 2012-06-20 09:13:47 -07:00
Kenny Root
ec7e483c55 Packages for PackageManagerService tests 
Change-Id: I3fd96abb0560fd8c596304d9c233e2f8f3fd8089
 2012-06-18 14:31:50 -07:00
Kenny Root
2414c8b37a am 535d3b3f: am 0cf34218: Merge "Adding test cases for getInstalledPackages" 
* commit '535d3b3f3363af6a5f2acb620542baec4cb96b45':
  Adding test cases for getInstalledPackages
 2012-06-15 16:47:14 -07:00
Kenny Root
535d3b3f33 am 0cf34218: Merge "Adding test cases for getInstalledPackages" 
* commit '0cf342184e030ee6f65d87eeba48484725910a8b':
  Adding test cases for getInstalledPackages
 2012-06-15 16:43:29 -07:00
Kenny Root
0cf342184e Merge "Adding test cases for getInstalledPackages" 2012-06-15 16:22:36 -07:00
Amith Yamasani
a0ecfde69e Merge "SearchManagerService made multi-user aware" 2012-06-15 14:15:21 -07:00
Amith Yamasani
5bb87cd9b8 SearchManagerService made multi-user aware 
Cache Searchables per user and query package manager through the
private interface.

Change-Id: I1d24fdd27cce8c27be45287cbfcb4df1e2ce2cf1
 2012-06-15 10:24:47 -07:00
Tsu Chiang Chuang
723118c9e1 Clean up host tests that have been moved to TF. 
Change-Id: Iebadfc6aefeca18a944079a7e9115a3c53c211ce
 2012-06-13 14:26:53 -07:00
Kenny Root
450f21a97d am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp 
* commit 'd26f7139a7ff42ca1be470657515767f7509955b':
  Add JNI bindings for some of the libselinux interfaces.
 2012-06-08 14:08:28 -07:00
Kenny Root
e38b1c4d15 resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp 
Change-Id: I012bd3b5946dedba3439285caa93739d44ebc60f
 2012-06-08 13:47:46 -07:00
Kenny Root
7b2d056342 Merge "Add JNI bindings for some of the libselinux interfaces." 2012-06-08 12:25:07 -07:00
Martin Wallgren
f2f1b6c946 Adding test cases for getInstalledPackages 
There was an earlier fix for a case where the binder
heap would run out of space when calling the
getInstalledPackages. This could happen when there were
a lot of installed packages.

This change adds some test cases to verify that fix.

Change-Id: I8e0c5f674bf2098adcff6d40893f94162961031f
 2012-06-07 14:01:57 +02:00
Wink Saville
bbf30dfd76 Enhance StateMachine Quitting and logging support. 
Make StateMachine#quit non-conditional and remove the need to
process the SM_QUIT_CMD it is now private.

Rename halting to onHalting.

Add onQuitting

Change the message specific logging to be more generic and change
the xxxProcessedMessagesYyy methods to xxxLogRecXyy names. Also add
addLogRec(String) and addLogRec(String, State) as the generic logging
methods.


bug: 5678189
Change-Id: I22f66d11828bfd70498db625fe1be728b90478b7
 2012-05-29 12:40:46 -07:00
Jesse Wilson
fc1f1d173e am 0ddb5d3b: am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev 
* commit '0ddb5d3b5d91ed0b891476e834de5ec4ffafece8':
  Change NPN to forbid empty lists of protocols.
 2012-05-21 12:40:41 -07:00
Svetoslav Ganov
f1a97a851d am 044d40ad: am 824aa860: Merge "Accessibility service needs to request permission to be bound to." into jb-dev 
* commit '044d40ad87f5f6a321aa48f74e05b8355c40f422':
  Accessibility service needs to request permission to be bound to.
 2012-05-17 17:18:21 -07:00
Jesse Wilson
0ddb5d3b5d am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev 
* commit '9cb376e792567b5278e0eb418a3aeb848339a283':
  Change NPN to forbid empty lists of protocols.
 2012-05-17 11:20:21 -07:00
Jesse Wilson
9cb376e792 Merge "Change NPN to forbid empty lists of protocols." into jb-dev 2012-05-17 11:18:33 -07:00
Jesse Wilson
2108ead7f1 Change NPN to forbid empty lists of protocols. 
Bug: http://b/6438423
Change-Id: Ie89220e5bc219396c15dbe1feaa2f74fa1b243eb
 2012-05-17 13:46:17 -04:00
Svetoslav Ganov
044d40ad87 am 824aa860: Merge "Accessibility service needs to request permission to be bound to." into jb-dev 
* commit '824aa860cd0b38b09779aab417612b115fd495a3':
  Accessibility service needs to request permission to be bound to.
 2012-05-16 17:58:00 -07:00
Svetoslav Ganov
824aa860cd Merge "Accessibility service needs to request permission to be bound to." into jb-dev 2012-05-16 17:52:59 -07:00
Svetoslav Ganov
53e184d34e Accessibility service needs to request permission to be bound to. 
1. Every accessibility services targeting JellyBean or higher has
   to request a special permission for the system to bind to it.

Change-Id: I6e579326bdf3597f148d6c67317455701ec8af68
 2012-05-16 15:57:15 -07:00
Xia Wang
c5f4b20f75 am 3f68e78f: am 1d366274: Merge "Fix issue: Disable soft ap when test activity is created. Add timer for soft ap enalbing timer: 6192139" into jb-dev 
* commit '3f68e78f1b7d43d58e0b0730dfd57f9e6948ff10':
  Fix issue: Disable soft ap when test activity is created.            Add timer for soft ap enalbing timer: 6192139
 2012-05-15 17:42:45 -07:00
Xia Wang
3f68e78f1b am 1d366274: Merge "Fix issue: Disable soft ap when test activity is created. Add timer for soft ap enalbing timer: 6192139" into jb-dev 
* commit '1d366274bac3153123bd37132ab87e3652e7feab':
  Fix issue: Disable soft ap when test activity is created.            Add timer for soft ap enalbing timer: 6192139
 2012-05-15 17:38:42 -07:00
Xia Wang
1d366274ba Merge "Fix issue: Disable soft ap when test activity is created. Add timer for soft ap enalbing timer: 6192139" into jb-dev 2012-05-15 17:34:44 -07:00
Xia Wang
2f19a3103c Fix issue: Disable soft ap when test activity is created. 
Add timer for soft ap enalbing timer: 6192139

Change-Id: I9f9a6a1f0787efdfbb924af80f7d610c07cd32e5
 2012-05-15 16:10:55 -07:00
David Hu
db17c38e17 am adba4f45: am 981bd8a4: Merge "Allow tests to run when bandwidth profiling fails" into jb-dev 
* commit 'adba4f454e102c89bf08cc8bbfcaf9f3751c4bf6':
  Allow tests to run when bandwidth profiling fails
 2012-05-15 12:43:34 -07:00
David Hu
adba4f454e am 981bd8a4: Merge "Allow tests to run when bandwidth profiling fails" into jb-dev 
* commit '981bd8a4cdd488abd69e17b275dac08c14f2ec61':
  Allow tests to run when bandwidth profiling fails
 2012-05-15 12:39:34 -07:00
David Hu
981bd8a4cd Merge "Allow tests to run when bandwidth profiling fails" into jb-dev 2012-05-15 12:37:52 -07:00
David Hu
71a0d06fd8 Allow tests to run when bandwidth profiling fails 
When bandwidth profiling fails due to lack of kernel module
the test should still be able to run.

Change-Id: Ib111989d2892b05c147889e562e77035fab05140
 2012-05-14 18:13:19 -07:00
Kenny Root
e4fd3d50c7 am 42a419b4: am 718af32a: Merge "Use long instead of int for file offsets" into jb-dev 
* commit '42a419b4c0e7d16145e336ceec709dcefbdcf894':
  Use long instead of int for file offsets
 2012-05-10 15:00:32 -07:00
Kenny Root
42a419b4c0 am 718af32a: Merge "Use long instead of int for file offsets" into jb-dev 
* commit '718af32a191066822262ad05cdd525a09c66094f':
  Use long instead of int for file offsets
 2012-05-10 14:57:34 -07:00
Kenny Root
103d53005e Use long instead of int for file offsets 
Use long instead of int so we don't run into a 2GB file limit.

Fix possible overflows in offset and length.

Change-Id: Idb3a34f5600f9c2372b9c89256f21757049fa43b
 2012-05-10 11:48:21 -07:00
Jeff Sharkey
4311705501 am fe9e28cb: am 6367b166: Merge "Recover from Throwable in FileRotator, dump." into jb-dev 
* commit 'fe9e28cba7dabb452fdbadcf421f7f758a859447':
  Recover from Throwable in FileRotator, dump.
 2012-05-10 09:33:21 -07:00
Jeff Sharkey
fe9e28cba7 am 6367b166: Merge "Recover from Throwable in FileRotator, dump." into jb-dev 
* commit '6367b1669d41f9fe7cd7abe5e05296edecd50f8e':
  Recover from Throwable in FileRotator, dump.
 2012-05-10 09:23:59 -07:00
Jeff Sharkey
6367b1669d Merge "Recover from Throwable in FileRotator, dump." into jb-dev 2012-05-09 14:36:40 -07:00
Jeff Sharkey
6de357e4d1 Recover from Throwable in FileRotator, dump. 
In rewriteSingle(), catch Throwable to rollback to backup file,
instead of just IOException. Also add dumpAll() to pack up contents
for later debugging, and use it when encountering bad stats.

Bug: 6467868
Change-Id: Ic8e287cf5a235706811a304a88d71d11d3a79cd4
 2012-05-09 13:43:19 -07:00
Xia Wang
6fce46c6bc am cae2b331: am 72e95cfe: Merge "Fix Wifi test" into jb-dev 
* commit 'cae2b331b837f6b156aaae83254617a81a21048e':
  Fix Wifi test
 2012-05-09 10:11:06 -07:00
Kenny Root
c72b502d89 am 83ea8609: am 29bb27ef: Merge "Add encryption parameters to package installation" into jb-dev 
* commit '83ea86091bf94571912694c7caf8be1c21727f91':
  Add encryption parameters to package installation
 2012-05-09 10:08:19 -07:00
Xia Wang
cae2b331b8 am 72e95cfe: Merge "Fix Wifi test" into jb-dev 
* commit '72e95cfef014c9354812717982bf312880d2bab5':
  Fix Wifi test
 2012-05-09 01:49:51 -07:00