859 Commits

Author SHA1 Message Date
Kenny Root
98e15e7893 Use Libcore's stat instead of FileUtils#getFileStatus
Remove the last user of FileUtils#getFileStatus and move it to
Libcore.os.stat instead. Then we can remove the JNI code that does the
equivalent of a stat.

Change-Id: Ieb566a2a8a17c2dd0150724b4eb3ac1cc41c823d
2012-08-16 15:27:55 -07:00
Wink Saville
33034b13ca Create telephony-common and mms-common - DO NOT MERGE
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-17 12:23:09 -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
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
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
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
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
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
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
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
cae2b331b8 am 72e95cfe: Merge "Fix Wifi test" into jb-dev
* commit '72e95cfef014c9354812717982bf312880d2bab5':
  Fix Wifi test
2012-05-09 01:49:51 -07:00
Kenny Root
83ea86091b am 29bb27ef: Merge "Add encryption parameters to package installation" into jb-dev
* commit '29bb27ef90564a294d506c2ffd546ba21788aeac':
  Add encryption parameters to package installation
2012-05-09 01:45:43 -07:00
Xia Wang
72e95cfef0 Merge "Fix Wifi test" into jb-dev 2012-05-08 19:13:14 -07:00
Anonymous Coward
ceb1b0bfae Add encryption parameters to package installation
Change-Id: Ic9f8ab9f8110f08bb3c00725cfce5b8ee7b766f3
2012-05-07 16:34:49 -07:00
Xia Wang
81341fee6d Fix Wifi test
bug: http://b/issue?id=6446248
Change-Id: I22783ed3de37bf51aed7cee9617017868f524f0d
2012-05-06 16:03:34 -07:00
Fred Quintana
5484e82612 am 989c7532: Merge "fix expedited syncs. there were times when an expedited sync wouldn\'t correctly preempt non-expedited syncs" into jb-dev
* commit '989c753281fcb689ea163530096ac589c9e5a44f':
  fix expedited syncs. there were times when an expedited sync wouldn't correctly preempt non-expedited syncs
2012-05-06 15:28:25 -07:00
Fred Quintana
dc47556cb3 fix expedited syncs. there were times when an expedited sync wouldn't
correctly preempt non-expedited syncs

Change-Id: Ia88ce6504c06d7c8e50e40362e8bf2b85bd0934b
2012-05-06 13:39:36 -07:00
Jeff Sharkey
3ddb4f80e5 am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev
* commit 'c065a8af1561544f1557e3f5036e45a4be4a6d7e':
  Begin collecting xtables iface counters.
2012-05-04 12:54:46 -07:00
Jeff Sharkey
c065a8af15 Merge "Begin collecting xtables iface counters." into jb-dev 2012-05-04 12:53:02 -07:00
Kenny Root
f154df1a31 am 03f22533: Merge "Fix some problems with ASECs" into jb-dev
* commit '03f22533a7ed398351f7c98af4a91d91354a2095':
  Fix some problems with ASECs
2012-05-02 22:48:16 -07:00
Kenny Root
03f22533a7 Merge "Fix some problems with ASECs" into jb-dev 2012-05-02 22:46:55 -07:00
Jeff Sharkey
5924a7dc53 am 3b5a7089: Merge "Support full 32 bits for socket tags." into jb-dev
* commit '3b5a7089c7d08042f8ff62e50eb76fc8f6cb80c8':
  Support full 32 bits for socket tags.
2012-05-02 19:39:45 -07:00
Kenny Root
bf023589b3 Fix some problems with ASECs
On devices that had external storage, permissions weren't set correctly
on non-forward-locked applications. Also, moving forward locked
applications didn't work since DefaultContainerService wasn't able to
read it.

Fixed some faulty unit tests as well.

Bug: 6427212
Change-Id: I5c1f0bf5278549069c78939f0708c4c43a7d4006
2012-05-02 17:09:57 -07:00
Jeff Sharkey
2d6c580262 Support full 32 bits for socket tags.
Bug: 5321184
Change-Id: Iadb3a4ad541ef012cea35b70ad440eca4c879f42
2012-05-02 16:01:14 -07:00
Jeff Sharkey
e8914c3627 Begin collecting xtables iface counters.
Add method to parse new iface_stat_fmt proc stats, or return null
when kernel support is unavailable. Add test and remove older, unused
parsing code. Create new "xt" recorder to persist the new xtables
counters when available.

Add SSID support to NetworkIdentity to fix policy tests.

Bug: 6422414
Change-Id: I77f70e9acb79a559ab626f3af5c4f3599801ed43
2012-05-01 21:04:26 -07:00
Jean-Baptiste Queru
647867ad5a am 63d944d6: am 93a8225e: Merge "Improve robustness of resource overlay test suite."
* commit '63d944d62e9c85e2b2aa611be1a8d5a6c6ff973f':
  Improve robustness of resource overlay test suite.
2012-05-01 10:09:21 -07:00
Jean-Baptiste Queru
39b58ba2b2 resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2
2012-05-01 09:54:38 -07:00
Jean-Baptiste Queru
93a8225e54 Merge "Improve robustness of resource overlay test suite." 2012-05-01 09:20:47 -07:00
Jean-Baptiste Queru
9e3bc3f61d Merge "Build overlay packages just like regular packages." 2012-05-01 08:49:38 -07:00
Jeff Brown
c458ce98ce Add support for using the lid switch to turn off the screen.
Added a config option to allow the lid switch to turn off the
screen.  This is a closer match to what a lid switch should be
doing.

Removed an old feature to bypass keyguard when keyboard is visible
because the way it was plumbed in made bad assumptions about
the meaning of the lid switch.  Also, the last product we shipped
that had a physical keyboard turned this config option off.
So away it goes.  We can bring it back someday if we really want it.
It's questionable how useful the feature is anyhow, since it only
works when the keyguard is unsecure and when the lid switch is
unlikely to be jostled in the user's pocket.

Fixed a bug where we would tell the power manager that the keyboard
was visible even if the lid switch did not control the keyboard.
This used to cause the power manager to try to set the keyboard
brightness, which doesn't work.

Bug: 6377115
Bug: 6406726
Change-Id: Ic84b71d09563d51c92cd1cf132fa8bdee6509103
2012-04-30 15:48:42 -07:00
Kenny Root
6dceb88f1c Allow forward locked apps to be in ASECs
We couldn't put forward-locked apps in ASEC containers before since we
didn't have any permissioned filesystems. This adds the ability for
forward-locked applications to be in ASEC containers.

This means that forward locked applications will be able to be on the SD
card now.

This change also removes the old type of forward-locking that placed
parts of apps in /data/app-private.  Now all forward-locked applications
will be in ASEC containers.

Change-Id: I17ae0b0d65a4a965ef33c0ac2c47e990e55707ad
2012-04-25 14:17:02 -07:00
Chris Wren
54dfa5d90e Don't allow children of a SizeAdaptiveLayout to measure outside their declared range of valid sizes.
Bug: 6377749
Change-Id: Ie706006eee9c0ed8dda468212a652941b8e20be0
2012-04-24 16:14:31 -04:00
Gilles Debunne
0b568ff179 Merge "TextView's sub display lists have tighten bounds" 2012-04-20 10:56:05 -07:00
Chris Wren
d84e593746 fix press feedback on notification rows
Change-Id: I50de2f4d6142c2553428abc853c820f4354d0640
Bug: 6362246
2012-04-20 09:40:11 -07:00
Gilles Debunne
157aafcbee TextView's sub display lists have tighten bounds
An editable TextView caches text rendering inside an adaptive
number of sub display lists. The bounds of these use to be those
of the entire View.

This CL creates block display lists with tighten bounds, so that
(a still-to-be-implemented) quick rejection can occur.

Also cleaned-up the contradictory translations that were used to
handle the TextView's internal scroll and removed the invalidation
of display lists in that case.

TODO: When internal scroll sets a tighter clipping rect, quick
reject the creation and display of the clipped display lists.

Also renamed blockEnds to a more explicit blockEndLines.

Change-Id: I7d79bea78d06d19b6935aef75ff7aa7df2594050
2012-04-19 18:06:46 -07:00