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

103034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
db3792d129 am 8074cc0c: Merge "Fix string for tablet" into jb-mr2-dev 
* commit '8074cc0c068c06cea7e174f82c0f1c235fae43a7':
  Fix string for tablet
 2013-03-26 15:15:16 -07:00
Elliott Hughes
fbf37c79bd Remove dead DateUtils code that was never in an API level. 
Also rewrite @deprecated comments to use an initial capital so they
look right in the generated documentation.

Also improve formatIpAddress documentation.

Change-Id: I317ebe411ef76e16a4535318ce73e00b63af38da
 2013-03-26 15:11:28 -07:00
Irfan Sheriff
8074cc0c06 Merge "Fix string for tablet" into jb-mr2-dev 2013-03-26 22:11:11 +00:00
Amith Yamasani
71e6c697e5 Device Owner, a special kind of device admin 
A Device Owner cannot be uninstalled and is available to all users. It must
be registered before the device_provisioned flag is set.

Device admins can be disabled until used, but visible to device policy
manager, so that users wont be bothered with update requests.

Opened up a few related APIs for use by a system-installed Device Owner.

Change-Id: I847b5fe68c0f724863f778a67602b5bddc79d8e5
 2013-03-26 15:09:08 -07:00
Elliott Hughes
08b025bd3d am c5f790f3: am 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 
* commit 'c5f790f3ba6981c0ddf0046fffeaea1ee04b008d':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
 2013-03-26 15:02:36 -07:00
Elliott Hughes
c5f790f3ba am 145e60b3: am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 
* commit '145e60b3e31f8daaf8e12dba0668c12e47968dd1':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
 2013-03-26 14:58:10 -07:00
Elliott Hughes
145e60b3e3 am 6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 
* commit '6c75deb5050c7fdde15b04aa96aa61c7b586e1f9':
  Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
 2013-03-26 14:56:03 -07:00
Elliott Hughes
6c75deb505 Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo." 2013-03-26 21:39:51 +00:00
Michael Wright
40f8f0d136 Deliver key repeats for artificial dpad events 
Bug: 8425219
Change-Id: Ib41b06ed40d43f2e30ce2a647871a76cea80177b
 2013-03-26 14:34:14 -07:00
Jeff Sharkey
e07cc0f399 am 0e93adc6: Merge "Update TrafficStats docs to reflect behavior." into jb-mr2-dev 
* commit '0e93adc6e93cd16b6e8485d699a29c91878c791e':
  Update TrafficStats docs to reflect behavior.
 2013-03-26 14:24:06 -07:00
Jason Sams
8b8ca344b2 am f3f0e155: Merge "Add yuv get" into jb-mr2-dev 
* commit 'f3f0e155e11a705352239506e5a4adcfdacf2f4a':
  Add yuv get
 2013-03-26 14:20:34 -07:00
Jeff Sharkey
0e93adc6e9 Merge "Update TrafficStats docs to reflect behavior." into jb-mr2-dev 2013-03-26 21:20:19 +00:00
Irfan Sheriff
cf7c1b4dfb Fix string for tablet 
Bug: 7467441
Change-Id: I77661097a8562d789089b81bc8b3ae93ff6ddcc4
 2013-03-26 14:17:28 -07:00
Jason Sams
f3f0e155e1 Merge "Add yuv get" into jb-mr2-dev 2013-03-26 21:15:36 +00:00
Irfan Sheriff
16c06fee5c am f5186417: Merge "Fix clearing linkproperties on disconnect" into jb-mr2-dev 
* commit 'f51864176be7356d609e6221e2109d49799673b1':
  Fix clearing linkproperties on disconnect
 2013-03-26 13:50:25 -07:00
Irfan Sheriff
f51864176b Merge "Fix clearing linkproperties on disconnect" into jb-mr2-dev 2013-03-26 20:47:25 +00:00
Jeff Sharkey
dddace7582 Update TrafficStats docs to reflect behavior. 
Bug: 8399623
Change-Id: If9ccd305e8a077f318a09ac1bb160b8efbf903aa
 2013-03-26 13:46:09 -07:00
Irfan Sheriff
81196b207a Fix clearing linkproperties on disconnect 
Bug: 5472644
Change-Id: If2b32b16fd3d65f1da12a9c5a8083d50125283d5
 2013-03-26 13:38:57 -07:00
Jason Sams
5a722cf8b2 Add yuv get 
Change-Id: I6df5c0a8129283c0ad600b232790da10c395b479
 2013-03-26 13:27:37 -07:00
Elliott Hughes
a480dafbf2 Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo. 
It was possible to overrun this buffer, and even if you did fill
the buffer in a single read and exit the loop, the "string" still
wouldn't be terminated.

Bug: 8468088
Change-Id: Ia19f4d26dfd79e7b63807a7ec9540b932163d246
 2013-03-26 13:18:52 -07:00
Michael Wright
1426be82b4 am c3d8790d: Merge "Remove misleading documentation from SystemClock" into jb-mr2-dev 
* commit 'c3d8790d53d23c4d9d3b9557d5811fde66ab791c':
  Remove misleading documentation from SystemClock
 2013-03-26 13:17:16 -07:00
Michael Wright
c3d8790d53 Merge "Remove misleading documentation from SystemClock" into jb-mr2-dev 2013-03-26 20:13:17 +00:00
Chiao Cheng
ef23bf198d Allow leading slash in path argument for addURI() method. 
The original documentation for this class indicated a leading slash was possible
but the code did not support it.  Since then, the docs were changed to reflect
what the code does.

The purpose of this change is to allow the use of uri.getPath() as an argument.
With this change, the following can be done

matcher.addURI(ContactsContract.AUTHORITY,
        ContactsContract.CONTENT_FILTER_URI.getPath(), CONTACTS_FILTER)

instead of

matcher.addURI(ContactsContract.AUTHORITY,
        "contacts/filter", CONTACTS_FILTER)

Change-Id: I76a9e3133365be9fe7a8de86eae57f9eea1cd2a3
 2013-03-26 11:20:47 -07:00
The Android Open Source Project
6b749cd07a Reconcile with jb-mr2-release - do not merge 
Change-Id: I499f557f51897fdc8fa9c1cab67ee1af4b91ce9d
 2013-03-26 10:49:24 -07:00
Jeff Sharkey
d9fe2934d7 It helps to catch the right exception. 
Bug: 7238149
Change-Id: I7b60ec44d1d1d5ece8a871cb089f811b611f4a4a
 2013-03-26 10:36:01 -07:00
Jeff Sharkey
dac3a54638 am 7e9221c5: Merge "It helps to catch the right exception." into jb-mr2-dev 
* commit '7e9221c5548b711bb083589d2c0d32eb6cf2fb8d':
  It helps to catch the right exception.
 2013-03-26 10:33:32 -07:00
Jeff Sharkey
7e9221c554 Merge "It helps to catch the right exception." into jb-mr2-dev 2013-03-26 17:29:43 +00:00
Jeff Sharkey
9ae62f5934 It helps to catch the right exception. 
Bug: 7238149
Change-Id: I7b60ec44d1d1d5ece8a871cb089f811b611f4a4a
 2013-03-26 10:29:01 -07:00
Joe Malin
bc9e97abe6 am 3be53a86: am 3e904d62: am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '3be53a86dc5ee08e45c7fd657084107fa7ed2e1b':
  Android Training: Accessing Contacts
 2013-03-26 09:45:30 -07:00
Joe Malin
3be53a86dc am 3e904d62: am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '3e904d62b6df1b8b99aa53ff62aee752b41c5163':
  Android Training: Accessing Contacts
 2013-03-26 09:42:51 -07:00
Joe Malin
3e904d62b6 am e4ba94e5: am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit 'e4ba94e550814422784b630acab80f104460384d':
  Android Training: Accessing Contacts
 2013-03-26 09:41:30 -07:00
Joe Malin
e4ba94e550 am e64253fb: am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit 'e64253fbcaa1a8eae4dc5e3d52e8404f40e853ff':
  Android Training: Accessing Contacts
 2013-03-26 09:39:23 -07:00
Joe Malin
e64253fbca am 0e84afdb: am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '0e84afdb946613ef3ccfd40f9eccf98eaf3f1521':
  Android Training: Accessing Contacts
 2013-03-26 09:37:58 -07:00
Joe Malin
0e84afdb94 am 1be81a96: am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '1be81a96bbd43133eb70ce52515d5cc91d270bc8':
  Android Training: Accessing Contacts
 2013-03-26 09:36:26 -07:00
Joe Malin
1be81a96bb am 98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev 
* commit '98827948f1911af89687d991c5549ec1b8b8549a':
  Android Training: Accessing Contacts
 2013-03-26 09:33:51 -07:00
Joe Malin
98827948f1 Merge "Android Training: Accessing Contacts" into jb-mr1-dev 2013-03-26 16:31:22 +00:00
The Android Automerger
0ade9294f5 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-26 05:55:46 -07:00
Robert Craig
4a4537331b Save off the seinfo value with packages.list. 
Patch adds the seinfo label per package to the file.
This is of particular interest to the run-as program
which uses the seinfo tag to correctly label the
app security context before running the shell.

Change-Id: I9d7ea47c920b1bc09a19008345ed7fd0aa426e87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2013-03-26 08:45:28 -04:00
Geremy Condra
e76fab2a42 am df4144f4: am 9fa57b74: am 2aee33c1: Merge "BackupManagerService files need new security labeling." 
* commit 'df4144f4dfaa3a344cfdf923121f6113463978da':
  BackupManagerService files need new security labeling.
 2013-03-26 05:32:02 +00:00
Geremy Condra
df4144f4df am 9fa57b74: am 2aee33c1: Merge "BackupManagerService files need new security labeling." 
* commit '9fa57b74d8acb99c86f761a98f6e76998de8aff2':
  BackupManagerService files need new security labeling.
 2013-03-25 22:29:10 -07:00
Geremy Condra
9fa57b74d8 am 2aee33c1: Merge "BackupManagerService files need new security labeling." 
* commit '2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8':
  BackupManagerService files need new security labeling.
 2013-03-25 22:26:56 -07:00
Geremy Condra
2aee33c1cd Merge "BackupManagerService files need new security labeling." 2013-03-26 05:10:38 +00:00
Fabrice Di Meglio
23ac93c3e4 am 172fc865: Merge "Fix the build" into jb-mr2-dev 
* commit '172fc865d34359b6cb0e3cd86789d06bd50e5bce':
  Fix the build
 2013-03-26 02:22:29 +00:00
Fabrice Di Meglio
172fc865d3 Merge "Fix the build" into jb-mr2-dev 2013-03-26 02:19:34 +00:00
Fabrice Di Meglio
768f272976 Fix the build 
See bug #8200928

Change-Id: I014590f41d74f16cf3c3de618ef08ee490bf05aa
 2013-03-25 19:18:18 -07:00
Chet Haase
656ed30716 am bc6c050f: Merge "Fix touch processing for Overlay views" into jb-mr2-dev 
* commit 'bc6c050f9c603159c526cc7d60ec9159c57359e7':
  Fix touch processing for Overlay views
 2013-03-26 01:57:59 +00:00
Chet Haase
bc6c050f9c Merge "Fix touch processing for Overlay views" into jb-mr2-dev 2013-03-26 01:55:12 +00:00
Geremy Condra
d6c1394dd0 am 51163e3b: Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev 
* commit '51163e3baa89088134486d45ff9a8955a7b9eb93':
  Add seinfo parsing to PackageManagerService.
 2013-03-26 01:44:21 +00:00
Geremy Condra
51163e3baa Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev 2013-03-26 01:38:56 +00:00
Eric Laurent
8a51acae5d Display vibrate icon in volume panel 
When a tablet is in vibrate mode, the notification
volume icon in the expanded volume panel should
be vibrate and not silent.

Bug 7235006

Change-Id: I150c1f0f571e3910ebae57442a75740cef00341e
 2013-03-25 18:36:35 -07:00