OSDN Git Service
kmccormick [Thu, 28 Mar 2013 01:59:42 +0000 (18:59 -0700)]
am
418172bf: am
19840a8d: am
65c66c74: am
6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '
418172bf8823016785526b433801d44a4630f276':
Doc change: Fix typo DONT_DELTE
kmccormick [Thu, 28 Mar 2013 01:57:27 +0000 (18:57 -0700)]
am
19840a8d: am
65c66c74: am
6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '
19840a8d40139a12469ef92c3541f2a433d5ae85':
Doc change: Fix typo DONT_DELTE
kmccormick [Thu, 28 Mar 2013 01:56:08 +0000 (18:56 -0700)]
am
7db86662: am
63dc67bd: am
b1c453f2: am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
7db866620491b3fa09dbcf2abe097bf33a73b034':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:55:51 +0000 (18:55 -0700)]
am
65c66c74: am
6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '
65c66c74f4db7d16ccff1a67f416f74c716b3773':
Doc change: Fix typo DONT_DELTE
kmccormick [Thu, 28 Mar 2013 01:54:07 +0000 (18:54 -0700)]
am
63dc67bd: am
b1c453f2: am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
63dc67bd6b026d3590af980b5dfddd4e68fd7831':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:54:02 +0000 (18:54 -0700)]
am
6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
* commit '
6e6e861a58da7bc39e1fbad9ed8730c712e45123':
Doc change: Fix typo DONT_DELTE
kmccormick [Thu, 28 Mar 2013 01:52:24 +0000 (18:52 -0700)]
am
b1c453f2: am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
b1c453f2897a9bf7dcfe71a84512877c5c6f0536':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:50:36 +0000 (18:50 -0700)]
am
353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs
* commit '
353e7a2f2efa3a6d8d9538dca8f0d5d360c2a1e9':
Doc Update: bug fix.
kmccormick [Thu, 28 Mar 2013 01:49:36 +0000 (01:49 +0000)]
Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 01:47:58 +0000 (01:47 +0000)]
Merge "Doc Update: bug fix." into jb-mr1.1-docs
kmccormick [Thu, 28 Mar 2013 00:39:17 +0000 (17:39 -0700)]
Doc change: Fix typo DONT_DELTE
"Bug:
8273156"
Change-Id: I6ba2e780d1a8c2b7d1771e93125a10b228227020
Kenny Root [Thu, 28 Mar 2013 00:42:36 +0000 (17:42 -0700)]
am
3864aa39: Merge "Add interrupter library to simulate EINTR"
* commit '
3864aa3944254184ddcd61002cb9f1d7cb1d4c67':
Add interrupter library to simulate EINTR
kmccormick [Thu, 28 Mar 2013 00:18:26 +0000 (17:18 -0700)]
Doc Update: bug fix.
"Bug:
7541616"
Change-Id: I7b84eaa13a8f695585211035647fa88614bb1372
Kenny Root [Thu, 28 Mar 2013 00:16:30 +0000 (00:16 +0000)]
Merge "Add interrupter library to simulate EINTR"
Dianne Hackborn [Wed, 27 Mar 2013 00:46:21 +0000 (17:46 -0700)]
am
6b96e2f0: Merge "Two REMOVE_PROVIDER messages caused by race condition."
* commit '
6b96e2f0006b5c33973b3500d3bb72a8c7a3bd38':
Two REMOVE_PROVIDER messages caused by race condition.
Dianne Hackborn [Wed, 27 Mar 2013 00:17:41 +0000 (00:17 +0000)]
Merge "Two REMOVE_PROVIDER messages caused by race condition."
Guobin Zhang [Thu, 21 Mar 2013 05:57:11 +0000 (13:57 +0800)]
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>
Elliott Hughes [Tue, 26 Mar 2013 22:34:25 +0000 (15:34 -0700)]
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.
Elliott Hughes [Tue, 26 Mar 2013 22:25:22 +0000 (22:25 +0000)]
Merge "Remove dead DateUtils code that was never in an API level."
Elliott Hughes [Tue, 26 Mar 2013 22:11:28 +0000 (15:11 -0700)]
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
Elliott Hughes [Tue, 26 Mar 2013 21:56:03 +0000 (14:56 -0700)]
am
6c75deb5: Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."
* commit '
6c75deb5050c7fdde15b04aa96aa61c7b586e1f9':
Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo.
Elliott Hughes [Tue, 26 Mar 2013 21:39:51 +0000 (21:39 +0000)]
Merge "Remove the fixed-length buffer in DdmHandleNativeHeap.getLeakInfo."
Elliott Hughes [Tue, 26 Mar 2013 20:18:52 +0000 (13:18 -0700)]
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
Joe Malin [Tue, 26 Mar 2013 16:41:30 +0000 (09:41 -0700)]
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
Joe Malin [Tue, 26 Mar 2013 16:39:23 +0000 (09:39 -0700)]
am
e64253fb: am
0e84afdb: am
1be81a96: am
98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev
* commit '
e64253fbcaa1a8eae4dc5e3d52e8404f40e853ff':
Android Training: Accessing Contacts
Joe Malin [Tue, 26 Mar 2013 16:37:58 +0000 (09:37 -0700)]
am
0e84afdb: am
1be81a96: am
98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev
* commit '
0e84afdb946613ef3ccfd40f9eccf98eaf3f1521':
Android Training: Accessing Contacts
Joe Malin [Tue, 26 Mar 2013 16:36:26 +0000 (09:36 -0700)]
am
1be81a96: am
98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev
* commit '
1be81a96bbd43133eb70ce52515d5cc91d270bc8':
Android Training: Accessing Contacts
Joe Malin [Tue, 26 Mar 2013 16:33:51 +0000 (09:33 -0700)]
am
98827948: Merge "Android Training: Accessing Contacts" into jb-mr1-dev
* commit '
98827948f1911af89687d991c5549ec1b8b8549a':
Android Training: Accessing Contacts
Joe Malin [Tue, 26 Mar 2013 16:31:21 +0000 (16:31 +0000)]
Merge "Android Training: Accessing Contacts" into jb-mr1-dev
Geremy Condra [Tue, 26 Mar 2013 05:26:56 +0000 (22:26 -0700)]
am
2aee33c1: Merge "BackupManagerService files need new security labeling."
* commit '
2aee33c1cdf89c0754bb660cd2e0ec95a007d4a8':
BackupManagerService files need new security labeling.
Geremy Condra [Tue, 26 Mar 2013 05:10:37 +0000 (05:10 +0000)]
Merge "BackupManagerService files need new security labeling."
kmccormick [Mon, 25 Mar 2013 23:21:03 +0000 (16:21 -0700)]
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.
kmccormick [Mon, 25 Mar 2013 23:18:24 +0000 (16:18 -0700)]
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.
kmccormick [Mon, 25 Mar 2013 23:16:48 +0000 (16:16 -0700)]
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.
kmccormick [Mon, 25 Mar 2013 23:15:11 +0000 (16:15 -0700)]
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.
kmccormick [Mon, 25 Mar 2013 23:11:30 +0000 (23:11 +0000)]
Merge "Doc update: fix bug in Calendar Provider docs." into jb-mr1.1-docs
kmccormick [Mon, 25 Mar 2013 23:00:56 +0000 (16:00 -0700)]
Doc update: fix bug in Calendar Provider docs.
"Bug:
8472477"
Change-Id: Ib2d8b27a0343db45bb1efa326bd573c383573af2
Geremy Condra [Mon, 25 Mar 2013 21:49:28 +0000 (14:49 -0700)]
am
48718c85: Merge "Proper security labeling of multi-user data directories."
* commit '
48718c85b41b785cf6f6ae72beb4c5d46559b735':
Proper security labeling of multi-user data directories.
Geremy Condra [Mon, 25 Mar 2013 21:49:25 +0000 (14:49 -0700)]
am
4bcea122: Merge "Add seinfo parsing to PackageManagerService."
* commit '
4bcea1222ce447d9969d12927995ffdfad7c8322':
Add seinfo parsing to PackageManagerService.
Christopher Tate [Mon, 25 Mar 2013 21:20:20 +0000 (14:20 -0700)]
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
Christopher Tate [Mon, 25 Mar 2013 21:18:06 +0000 (14:18 -0700)]
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
Geremy Condra [Mon, 25 Mar 2013 21:17:46 +0000 (21:17 +0000)]
Merge "Proper security labeling of multi-user data directories."
Christopher Tate [Mon, 25 Mar 2013 21:15:38 +0000 (14:15 -0700)]
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
Christopher Tate [Mon, 25 Mar 2013 21:14:02 +0000 (14:14 -0700)]
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
Christopher Tate [Mon, 25 Mar 2013 21:11:10 +0000 (14:11 -0700)]
am
9432f83c: am
7b3ac9ad: am
0cb27e28: Validate restored file paths against their nominal domain
* commit '
9432f83cea107240bcb71b9230b3af7de4c2a036':
Validate restored file paths against their nominal domain
Christopher Tate [Mon, 25 Mar 2013 21:08:37 +0000 (14:08 -0700)]
am
7b3ac9ad: am
0cb27e28: Validate restored file paths against their nominal domain
* commit '
7b3ac9add80fde8e36201e7c2e05a3da10c44cec':
Validate restored file paths against their nominal domain
Geremy Condra [Mon, 25 Mar 2013 21:07:37 +0000 (21:07 +0000)]
Merge "Add seinfo parsing to PackageManagerService."
Christopher Tate [Mon, 25 Mar 2013 21:05:47 +0000 (14:05 -0700)]
am
0cb27e28: Validate restored file paths against their nominal domain
* commit '
0cb27e28071af59000198c8588c588a2e63cc0a3':
Validate restored file paths against their nominal domain
Christopher Tate [Mon, 25 Mar 2013 17:06:34 +0000 (10:06 -0700)]
Validate restored file paths against their nominal domain
Bug
8460775
(cherry picked from commit
7323765bbf13d9638cf2cc1e06113bffcdac46c4)
Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
Joe Malin [Tue, 15 Jan 2013 23:06:08 +0000 (15:06 -0800)]
Android Training: Accessing Contacts
Change-Id: I4de9f2a9ef18415225e1c85d53602bbaacbb7bb6
rpcraig [Wed, 28 Nov 2012 13:37:06 +0000 (08:37 -0500)]
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>
Robert Craig [Mon, 25 Mar 2013 10:33:03 +0000 (06:33 -0400)]
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>
Kenny Root [Thu, 21 Mar 2013 23:05:06 +0000 (16:05 -0700)]
am
f6c4dba2: Merge "KeyStore: change migrate to duplicate"
* commit '
f6c4dba2d30ddba41ccfd6d9d2be2729ea496902':
KeyStore: change migrate to duplicate
Kenny Root [Thu, 21 Mar 2013 21:56:53 +0000 (21:56 +0000)]
Merge "KeyStore: change migrate to duplicate"
Kenny Root [Thu, 21 Mar 2013 21:21:50 +0000 (14:21 -0700)]
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
Wink Saville [Thu, 21 Mar 2013 05:40:17 +0000 (22:40 -0700)]
am
e4679750: Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
* commit '
e4679750c538e982bb81f4eea2343e8bede3e118':
Fix Watchdog HeartbeatHandler to run on correct thread
Wink Saville [Thu, 21 Mar 2013 04:49:28 +0000 (04:49 +0000)]
Merge "Fix Watchdog HeartbeatHandler to run on correct thread"
kmccormick [Thu, 21 Mar 2013 00:02:30 +0000 (17:02 -0700)]
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
kmccormick [Wed, 20 Mar 2013 23:59:42 +0000 (16:59 -0700)]
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
kmccormick [Wed, 20 Mar 2013 23:57:42 +0000 (16:57 -0700)]
am
728c4a7e: am
90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
* commit '
728c4a7e4c19f134b82dbda2c8b1457a890e3765':
Doc update: notification class bug fix
kmccormick [Wed, 20 Mar 2013 23:55:38 +0000 (16:55 -0700)]
am
90ea5cc3: Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
* commit '
90ea5cc31f58b97bd3c61b6d01621d7ddd012102':
Doc update: notification class bug fix
kmccormick [Wed, 20 Mar 2013 23:52:30 +0000 (23:52 +0000)]
Merge "Doc update: notification class bug fix" into jb-mr1.1-docs
Kenny Root [Wed, 20 Mar 2013 23:06:02 +0000 (16:06 -0700)]
am
20345bd8: Merge "Update SELinux JNI to use helpers"
* commit '
20345bd81b866738f75c8b47a940b941b894cde1':
Update SELinux JNI to use helpers
Kenny Root [Wed, 20 Mar 2013 23:05:59 +0000 (16:05 -0700)]
am
42457027: Merge changes I65f7a915,I32098dc0
* commit '
424570273bc225edaf7425385812b173adeb8695':
KeyStore: add "migrate" command
KeyStore: add API to uid versions
kmccormick [Wed, 20 Mar 2013 22:44:33 +0000 (15:44 -0700)]
Doc update: notification class bug fix
Bug #
8289218
Change-Id: I8bc10aa4a227f8125824d69a6202c383b7de256f
Joe Fernandez [Wed, 20 Mar 2013 22:28:48 +0000 (15:28 -0700)]
am
ad070e0c: am
1d7ac400: am
bb3f2b9c: am
15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
* commit '
ad070e0c360fd6f02b6f6f128b42b89251449a62':
docs: NDK r8e Release Notes
Joe Fernandez [Wed, 20 Mar 2013 22:26:37 +0000 (15:26 -0700)]
am
1d7ac400: am
bb3f2b9c: am
15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
* commit '
1d7ac400064c90937bd322f66970a66b548c5025':
docs: NDK r8e Release Notes
Kenny Root [Wed, 20 Mar 2013 22:26:03 +0000 (22:26 +0000)]
Merge "Update SELinux JNI to use helpers"
kmccormick [Wed, 20 Mar 2013 22:25:16 +0000 (15:25 -0700)]
am
72d4a56d: am
4e8453b5: am
d42b977a: am
5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
* commit '
72d4a56d827a8fd256adde3ac013f013fe497deb':
Doc Update: GCM cleanup
Kenny Root [Fri, 19 Oct 2012 21:15:26 +0000 (14:15 -0700)]
Update SELinux JNI to use helpers
Change-Id: Ifc707eafd1ecbba64c93fa2250c4334d0ce40005
Joe Fernandez [Wed, 20 Mar 2013 22:24:10 +0000 (15:24 -0700)]
am
bb3f2b9c: am
15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
* commit '
bb3f2b9cf47b865613efc1045e6a982fe853ade8':
docs: NDK r8e Release Notes
kmccormick [Wed, 20 Mar 2013 22:23:11 +0000 (15:23 -0700)]
am
4e8453b5: am
d42b977a: am
5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
* commit '
4e8453b5b5f75e74acdeb5e528b5166bc6a4f5b8':
Doc Update: GCM cleanup
Joe Fernandez [Wed, 20 Mar 2013 22:21:45 +0000 (15:21 -0700)]
am
15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
* commit '
15de1aa94d5222dc6ae35f148bfa514218f60a07':
docs: NDK r8e Release Notes
kmccormick [Wed, 20 Mar 2013 22:20:45 +0000 (15:20 -0700)]
am
d42b977a: am
5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
* commit '
d42b977aacfba6646edb5331d9321ad1f02c7258':
Doc Update: GCM cleanup
kmccormick [Wed, 20 Mar 2013 22:18:11 +0000 (15:18 -0700)]
am
5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
* commit '
5640b8293cecf4c060c8847559bd017826d03180':
Doc Update: GCM cleanup
Joe Fernandez [Wed, 20 Mar 2013 22:17:35 +0000 (22:17 +0000)]
Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs
kmccormick [Wed, 20 Mar 2013 22:14:12 +0000 (22:14 +0000)]
Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs
Kenny Root [Wed, 20 Mar 2013 22:00:10 +0000 (22:00 +0000)]
Merge changes I65f7a915,I32098dc0
* changes:
KeyStore: add "migrate" command
KeyStore: add API to uid versions
kmccormick [Fri, 15 Mar 2013 20:05:45 +0000 (13:05 -0700)]
Doc Update: GCM cleanup
Bug #
8144337,
8289556,
8289952,
7579225
Change-Id: Ibfc4a703a89572525b75e71ac2b5392c41bd1733
Joe Fernandez [Mon, 18 Mar 2013 15:30:26 +0000 (08:30 -0700)]
docs: NDK r8e Release Notes
Change-Id: Id06bf788d631cccc69964cdef400a7e472060c4a
Kenny Root [Wed, 20 Mar 2013 18:36:50 +0000 (11:36 -0700)]
KeyStore: add "migrate" command
To support the WiFi service, we need to support migration from the
system UID to the wifi UID. This adds a command to achieve the
migration.
Bug:
8122243
Change-Id: I65f7a91504c1d2a2aac22b9c3051adffd28d66c1
Kenny Root [Thu, 14 Feb 2013 01:02:57 +0000 (17:02 -0800)]
KeyStore: add API to uid versions
In previous commits, we added the ability to specify which UID we want to
target on certain operations. This commit adds the ability to reach those
binder calls from the KeyStore class.
Also fix a problem where saw() was not reading all the values returned via
the Binder call. This changes the semantics to return a null instead of
failing silently when it's not possible to search.
Change-Id: I32098dc0eb42e09ace89f6b7455766842a72e9f4
Scott Main [Wed, 20 Mar 2013 01:38:05 +0000 (18:38 -0700)]
am
be83b5a7: am
7df36bc8: am
f2162147: am
6dbb6788: delete some obsolete links
* commit '
be83b5a72ffaf3ed91e9341340c0c0477005f538':
delete some obsolete links
Scott Main [Wed, 20 Mar 2013 01:36:15 +0000 (18:36 -0700)]
am
7df36bc8: am
f2162147: am
6dbb6788: delete some obsolete links
* commit '
7df36bc872e64b330d2a801adafee52e14112ec9':
delete some obsolete links
Scott Main [Wed, 20 Mar 2013 01:35:01 +0000 (18:35 -0700)]
am
f2162147: am
6dbb6788: delete some obsolete links
* commit '
f2162147c1dd8bd027a01f660108d214174379b5':
delete some obsolete links
Scott Main [Wed, 20 Mar 2013 01:32:33 +0000 (18:32 -0700)]
am
6dbb6788: delete some obsolete links
* commit '
6dbb6788b9ea32f36f6653fe48a0e00179540555':
delete some obsolete links
Scott Main [Wed, 20 Mar 2013 01:27:50 +0000 (18:27 -0700)]
delete some obsolete links
Change-Id: I1495295caa878c55536e60e84caf358d80705507
John Michelau [Mon, 18 Mar 2013 23:28:23 +0000 (18:28 -0500)]
Fix Watchdog HeartbeatHandler to run on correct thread
The HeartbeatHandler for the System Server Watchdog has been running
on the wrong thread due to a race condition in initialization. It's
designed to run on ServerThread, so that it can catch lockups in the
main looper of the System Server. It has been running on
ActivityManagerThread instead, so it does not detect lockups on the
ServerThread as it should.
ActivityManagerService is calling Watchdog.getInstance() before
ServerThread calls Watchdog.getInstance().init(), so the handler is
being bound to the ActivityManagerThread instead of the ServerThread.
Explicitly bind HeartbeatHandler to ServerThread, so that the Watchdog
catches lockups on this critical thread.
Change-Id: Iccb184ac3adb817feb86ed4ee0e50e443bf74636
Elliott Hughes [Tue, 19 Mar 2013 19:24:50 +0000 (12:24 -0700)]
am
ebebb80b: Merge "Remove dead code from DateUtils."
* commit '
ebebb80b4a629756128b5a4fcf483133f01dbfd7':
Remove dead code from DateUtils.
Elliott Hughes [Tue, 19 Mar 2013 18:45:54 +0000 (18:45 +0000)]
Merge "Remove dead code from DateUtils."
Elliott Hughes [Tue, 19 Mar 2013 18:36:12 +0000 (11:36 -0700)]
Remove dead code from DateUtils.
This stuff is @hide, @deprecated, unused, and was never in any API level.
Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
Elliott Hughes [Tue, 19 Mar 2013 17:11:19 +0000 (10:11 -0700)]
am
71558f1f: Merge "Fix times in debugging output to use H rather than k."
* commit '
71558f1fafa29fe993ab0556bbaee6530f3930d7':
Fix times in debugging output to use H rather than k.
Elliott Hughes [Tue, 19 Mar 2013 16:50:38 +0000 (16:50 +0000)]
Merge "Fix times in debugging output to use H rather than k."
Elliott Hughes [Tue, 19 Mar 2013 01:55:42 +0000 (18:55 -0700)]
Elliott Hughes [Tue, 19 Mar 2013 01:10:24 +0000 (18:10 -0700)]
Fix build.
(cherry-pick of
0a65ac90fae79687b46a8e70549204b97e4c951f.)
Change-Id: Idd0feede5bf5ce78f47f9a442019e68f7717a9e4
Elliott Hughes [Tue, 19 Mar 2013 01:11:02 +0000 (01:11 +0000)]
Merge "Fix build."
Elliott Hughes [Tue, 19 Mar 2013 01:10:24 +0000 (18:10 -0700)]
Fix build.
Change-Id: Icb7fb60f00251ab01c8f9844572bb349e45c6c41
Elliott Hughes [Tue, 19 Mar 2013 00:49:47 +0000 (17:49 -0700)]
am
a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k."
* commit '
a8974d3f0a799a5d76e226649c878a71b3b5e953':
Clean up (some of) our many clocks to use H instead of k.
Elliott Hughes [Tue, 19 Mar 2013 00:47:22 +0000 (17:47 -0700)]
Fix times in debugging output to use H rather than k.
Bug:
8359981
Change-Id: I4fccf3ed7e469b77f6e755dacbcd025005390505
Elliott Hughes [Tue, 19 Mar 2013 00:28:41 +0000 (00:28 +0000)]
Merge "Clean up (some of) our many clocks to use H instead of k."
OSDN Git Service
