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

868 Commits

Author SHA1 Message Date
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
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
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
94e4429086 am 5484e826: am 989c7532: Merge "fix expedited syncs. there were times when an expedited sync wouldn\'t correctly preempt non-expedited syncs" into jb-dev 
* commit '5484e82612ef67630f10a0179dfad55716bcce2a':
  fix expedited syncs. there were times when an expedited sync wouldn't correctly preempt non-expedited syncs
 2012-05-06 15:31:29 -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
353f8c7d33 am 3ddb4f80: am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev 
* commit '3ddb4f80e5cb47173b78430399076c4c3d1bb178':
  Begin collecting xtables iface counters.
 2012-05-04 12:59:11 -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
8ae5cd3b81 am f154df1a: am 03f22533: Merge "Fix some problems with ASECs" into jb-dev 
* commit 'f154df1a31e73c8b4342f54ea7d5508295d30936':
  Fix some problems with ASECs
 2012-05-02 22:50:52 -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
9151669615 am 5924a7dc: am 3b5a7089: Merge "Support full 32 bits for socket tags." into jb-dev 
* commit '5924a7dc53af273343bbdd8456de0c8477ad6b06':
  Support full 32 bits for socket tags.
 2012-05-02 19:42:36 -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
Brett Chabot
d733ec3b28 Prevent binder flooding when sending instrumentation status. 
There is a long standing bug in the InstrumentationTestRunner where executing
many fast-running tests causes it to hang with 'FAILED BINDER TRANSACTION'
messages in the logs.

This commit changes the Instrumentation status updates to be sent synchronously.

Bug 1796494

Change-Id: Ifd1af31158353d727bd88283eaeb90933ba1a3ca
 2012-05-01 12:33:28 -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