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

95523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
4224a4ca85 am 3864aa39: Merge "Add interrupter library to simulate EINTR" 
* commit '3864aa3944254184ddcd61002cb9f1d7cb1d4c67':
  Add interrupter library to simulate EINTR
 2013-03-27 17:42:36 -07:00
Kenny Root
3864aa3944 Merge "Add interrupter library to simulate EINTR" 2013-03-28 00:16:31 +00:00
Dianne Hackborn
bfd15fa005 am 6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition." 
* commit '6b96e2f0006b5c33973b3500d3bb72a8c7a3bd38':
  Two REMOVE_PROVIDER messages caused by race condition.
 2013-03-26 17:46:21 -07:00
Dianne Hackborn
6b96e2f000 Merge "Two REMOVE_PROVIDER messages caused by race condition." 2013-03-27 00:17:41 +00:00
Guobin Zhang
9e3e526650 Two REMOVE_PROVIDER messages caused by race condition. 
Fix a bug in unstable ContentProvider.
IllegalStateException: ref counts can't go to zero here: stable=0 unstable=0
IllegalStateException: unstable count < 0: -1

There is a race between main thread and background database thread. Main thread
is responsible for handling the REMOVE_PROVIDER message. Database thread starts
insert or query request again and again. acquireProvider in db thread will often
snatch provider from the jaws of death, sometime it fails to remove REMOVE_PROVIDER
which is already fired out from MessageQueue. But completeRemoveProvider in main
thread gets suspended when trying to execute the critical section. If db thread
released the provider before main thread resumes the execution, then two
REMOVE_PROVIDER messages will be executed.

Change-Id: I8588aa1d1a8bc444dcd2adf6f8bc3f055cebbdc4
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
 2013-03-27 00:17:27 +00:00
Elliott Hughes
6f14ef7066 am 083bfa5a: Merge "Remove dead DateUtils code that was never in an API level." 
* commit '083bfa5a4cc867a62723537fc6f9a5213865bb19':
  Remove dead DateUtils code that was never in an API level.
 2013-03-26 15:34:25 -07:00
Elliott Hughes
083bfa5a4c Merge "Remove dead DateUtils code that was never in an API level." 2013-03-26 22:25:22 +00: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
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
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
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
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
kmccormick
33d388b057 am adc2d143: am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit 'adc2d143996ed98b5d5aa9fa5d5c964258a1f719':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 16:21:03 -07:00
kmccormick
adc2d14399 am 81f7ff7c: am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit '81f7ff7c498cbd82181e29db58961f6dc73ee319':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 16:18:24 -07:00
kmccormick
81f7ff7c49 am c15f817e: am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit 'c15f817e5092970820e6c3fa32c5715127e7bf37':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 16:16:48 -07:00
kmccormick
c15f817e50 am 81aaf3b0: Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 
* commit '81aaf3b0195ceb3c134c1b8a31e558fa31fc3e77':
  Doc update: fix bug in Calendar Provider docs.
 2013-03-25 16:15:11 -07:00
kmccormick
81aaf3b019 Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs 2013-03-25 23:11:30 +00:00
kmccormick
3a2608cc17 Doc update: fix bug in Calendar Provider docs. 
"Bug: 8472477"

Change-Id: Ib2d8b27a0343db45bb1efa326bd573c383573af2
 2013-03-25 16:02:19 -07:00
Geremy Condra
a9af6c3786 am 48718c85: Merge "Proper security labeling of multi-user data directories." 
* commit '48718c85b41b785cf6f6ae72beb4c5d46559b735':
  Proper security labeling of multi-user data directories.
 2013-03-25 14:49:28 -07:00
Geremy Condra
40a85bbc84 am 4bcea122: Merge "Add seinfo parsing to PackageManagerService." 
* commit '4bcea1222ce447d9969d12927995ffdfad7c8322':
  Add seinfo parsing to PackageManagerService.
 2013-03-25 14:49:25 -07:00
Christopher Tate
6e7a6b101b am 0e3411b2: am d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '0e3411b20c173ada46fe4abf5f14fe28e699da70':
  Validate restored file paths against their nominal domain
 2013-03-25 14:20:20 -07:00
Christopher Tate
0e3411b20c am d738f49a: am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit 'd738f49a1edeaf9c17b8b7ae7b5a5aeb9b56f16e':
  Validate restored file paths against their nominal domain
 2013-03-25 14:18:06 -07:00
Geremy Condra
48718c85b4 Merge "Proper security labeling of multi-user data directories." 2013-03-25 21:17:46 +00:00
Christopher Tate
d738f49a1e am b559b58e: am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit 'b559b58e950c8fe7ffe0c3201443ab814f24a701':
  Validate restored file paths against their nominal domain
 2013-03-25 14:15:38 -07:00
Christopher Tate
b559b58e95 am 5769c0b8: am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '5769c0b803ec604efafbf983dbf38e223646fb74':
  Validate restored file paths against their nominal domain
 2013-03-25 14:14:02 -07:00
Christopher Tate
5769c0b803 am 9432f83c: am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '9432f83cea107240bcb71b9230b3af7de4c2a036':
  Validate restored file paths against their nominal domain
 2013-03-25 14:11:10 -07:00
Christopher Tate
9432f83cea am 7b3ac9ad: am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '7b3ac9add80fde8e36201e7c2e05a3da10c44cec':
  Validate restored file paths against their nominal domain
 2013-03-25 14:08:37 -07:00
Geremy Condra
4bcea1222c Merge "Add seinfo parsing to PackageManagerService." 2013-03-25 21:07:37 +00:00
Christopher Tate
7b3ac9add8 am 0cb27e28: Validate restored file paths against their nominal domain 
* commit '0cb27e28071af59000198c8588c588a2e63cc0a3':
  Validate restored file paths against their nominal domain
 2013-03-25 14:05:47 -07:00
Christopher Tate
0cb27e2807 Validate restored file paths against their nominal domain 
Bug 8460775

(cherry picked from commit 7323765bbf13d9638cf2cc1e06113bffcdac46c4)

Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
 2013-03-25 13:44:34 -07:00
Joe Malin
421435d2be Android Training: Accessing Contacts 
Change-Id: I4de9f2a9ef18415225e1c85d53602bbaacbb7bb6
 2013-03-25 10:10:35 -07:00
rpcraig
1e0c8e6989 Proper security labeling of multi-user data directories. 
This patch covers 2 cases. When an app is installed
and the resulting data directory is created for all
existing users. And when a new user is created and
all existing app data directories are created for
the new user.

Change-Id: Iacaba6d9d18d5337e65713960d14efe32006b330
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2013-03-25 14:35:00 +00:00
Robert Craig
d3f8d0333c Add seinfo parsing to PackageManagerService. 
This patch set allows the PMS to parse the
mac_permissions.xml file which contains the
seinfo values. Each package that is installed
on the device will be assigned an seinfo value
based on policy. This seinfo value will help label
the app process and data directory.  Modifications
include adjustments to ApplicationInfo.java
to store the seinfo tag per package as well as
adjustments to installd to communicate the seinfo
tag to libselinux.

Change-Id: I61ad1ea12fb6a9a6d0b108ec163bc4bf4c954b58
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2013-03-25 06:33:03 -04:00
Kenny Root
9d262c49d9 am f6c4dba2: Merge "KeyStore: change migrate to duplicate" 
* commit 'f6c4dba2d30ddba41ccfd6d9d2be2729ea496902':
  KeyStore: change migrate to duplicate
 2013-03-21 16:05:06 -07:00
Kenny Root
f6c4dba2d3 Merge "KeyStore: change migrate to duplicate" 2013-03-21 21:56:54 +00:00
Kenny Root
5f1d965f7d KeyStore: change migrate to duplicate 
After discussion, it was determined that duplicate would be less
disruptive and it still fit in the current HAL model.

Change-Id: I2f9cae48d38ec7146511e876450fa39fc92cda55
 2013-03-21 14:24:19 -07:00
Wink Saville
6837f4a442 am e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread" 
* commit 'e4679750c538e982bb81f4eea2343e8bede3e118':
  Fix Watchdog HeartbeatHandler to run on correct thread
 2013-03-20 22:40:17 -07:00
Wink Saville
e4679750c5 Merge "Fix Watchdog HeartbeatHandler to run on correct thread" 2013-03-21 04:49:28 +00:00
kmccormick
0f6a93c48d am a75e413a: am 42d5732d: am 728c4a7e: am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs 
* commit 'a75e413a3a93d6bdafdff142400d7ded2b647ae4':
  Doc update: notification class bug fix
 2013-03-20 17:02:30 -07:00
kmccormick
a75e413a3a am 42d5732d: am 728c4a7e: am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs 
* commit '42d5732db218c5d37ecf66f268c0ed420cf3b882':
  Doc update: notification class bug fix
 2013-03-20 16:59:42 -07:00
kmccormick
42d5732db2 am 728c4a7e: am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs 
* commit '728c4a7e4c19f134b82dbda2c8b1457a890e3765':
  Doc update: notification class bug fix
 2013-03-20 16:57:42 -07:00
kmccormick
728c4a7e4c am 90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs 
* commit '90ea5cc31f58b97bd3c61b6d01621d7ddd012102':
  Doc update: notification class bug fix
 2013-03-20 16:55:38 -07:00
kmccormick
90ea5cc31f Merge "Doc update: notification class bug fix" into jb-mr1.1-docs 2013-03-20 23:52:30 +00:00