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

95680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kenny Root
d9520336a7 am 20345bd8: Merge "Update SELinux JNI to use helpers" 
* commit '20345bd81b866738f75c8b47a940b941b894cde1':
  Update SELinux JNI to use helpers
 2013-03-20 16:06:02 -07:00
Kenny Root
bda3e26f6f am 42457027: Merge changes I65f7a915,I32098dc0 
* commit '424570273bc225edaf7425385812b173adeb8695':
  KeyStore: add "migrate" command
  KeyStore: add API to uid versions
 2013-03-20 16:05:59 -07:00
kmccormick
6dc8d6ff82 Doc update: notification class bug fix 
Bug # 8289218

Change-Id: I8bc10aa4a227f8125824d69a6202c383b7de256f
 2013-03-20 15:45:01 -07:00
Joe Fernandez
2c824c21aa 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
 2013-03-20 15:28:48 -07:00
Joe Fernandez
ad070e0c36 am 1d7ac400: am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs 
* commit '1d7ac400064c90937bd322f66970a66b548c5025':
  docs: NDK r8e Release Notes
 2013-03-20 15:26:37 -07:00
Kenny Root
20345bd81b Merge "Update SELinux JNI to use helpers" 2013-03-20 22:26:03 +00:00
kmccormick
ccc7841d09 am 72d4a56d: am 4e8453b5: am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs 
* commit '72d4a56d827a8fd256adde3ac013f013fe497deb':
  Doc Update: GCM cleanup
 2013-03-20 15:25:16 -07:00
Kenny Root
cd19e3f2db Update SELinux JNI to use helpers 
Change-Id: Ifc707eafd1ecbba64c93fa2250c4334d0ce40005
 2013-03-20 15:24:25 -07:00
Joe Fernandez
1d7ac40006 am bb3f2b9c: am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs 
* commit 'bb3f2b9cf47b865613efc1045e6a982fe853ade8':
  docs: NDK r8e Release Notes
 2013-03-20 15:24:10 -07:00
kmccormick
72d4a56d82 am 4e8453b5: am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs 
* commit '4e8453b5b5f75e74acdeb5e528b5166bc6a4f5b8':
  Doc Update: GCM cleanup
 2013-03-20 15:23:11 -07:00
Joe Fernandez
bb3f2b9cf4 am 15de1aa9: Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs 
* commit '15de1aa94d5222dc6ae35f148bfa514218f60a07':
  docs: NDK r8e Release Notes
 2013-03-20 15:21:45 -07:00
kmccormick
4e8453b5b5 am d42b977a: am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs 
* commit 'd42b977aacfba6646edb5331d9321ad1f02c7258':
  Doc Update: GCM cleanup
 2013-03-20 15:20:45 -07:00
kmccormick
d42b977aac am 5640b829: Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs 
* commit '5640b8293cecf4c060c8847559bd017826d03180':
  Doc Update: GCM cleanup
 2013-03-20 15:18:11 -07:00
Joe Fernandez
15de1aa94d Merge "docs: NDK r8e Release Notes" into jb-mr1.1-docs 2013-03-20 22:17:35 +00:00
kmccormick
5640b8293c Merge "Doc Update: GCM cleanup" into jb-mr1.1-docs 2013-03-20 22:14:12 +00:00
Kenny Root
424570273b Merge changes I65f7a915,I32098dc0 
* changes:
  KeyStore: add "migrate" command
  KeyStore: add API to uid versions
 2013-03-20 22:00:10 +00:00
kmccormick
510f69b310 Doc Update: GCM cleanup 
Bug # 8144337, 8289556, 8289952, 7579225

Change-Id: Ibfc4a703a89572525b75e71ac2b5392c41bd1733
 2013-03-20 14:52:33 -07:00
Joe Fernandez
603dbd7853 docs: NDK r8e Release Notes 
Change-Id: Id06bf788d631cccc69964cdef400a7e472060c4a
 2013-03-20 14:35:29 -07:00
Kenny Root
bd79419ef8 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
 2013-03-20 11:57:46 -07:00
Kenny Root
78ad849163 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
 2013-03-20 16:50:06 +00:00
Scott Main
8efa65b183 am be83b5a7: am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit 'be83b5a72ffaf3ed91e9341340c0c0477005f538':
  delete some obsolete links
 2013-03-19 18:38:05 -07:00
Scott Main
be83b5a72f am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit '7df36bc872e64b330d2a801adafee52e14112ec9':
  delete some obsolete links
 2013-03-19 18:36:15 -07:00
Scott Main
7df36bc872 am f2162147: am 6dbb6788: delete some obsolete links 
* commit 'f2162147c1dd8bd027a01f660108d214174379b5':
  delete some obsolete links
 2013-03-19 18:35:01 -07:00
Scott Main
f2162147c1 am 6dbb6788: delete some obsolete links 
* commit '6dbb6788b9ea32f36f6653fe48a0e00179540555':
  delete some obsolete links
 2013-03-19 18:32:33 -07:00
Scott Main
6dbb6788b9 delete some obsolete links 
Change-Id: I1495295caa878c55536e60e84caf358d80705507
 2013-03-19 18:27:50 -07:00
John Michelau
116415271b 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
 2013-03-19 14:39:33 -05:00
Elliott Hughes
c1562075b0 am ebebb80b: Merge "Remove dead code from DateUtils." 
* commit 'ebebb80b4a629756128b5a4fcf483133f01dbfd7':
  Remove dead code from DateUtils.
 2013-03-19 12:24:50 -07:00
Elliott Hughes
ebebb80b4a Merge "Remove dead code from DateUtils." 2013-03-19 18:45:54 +00:00
Elliott Hughes
9a6fa1d637 Remove dead code from DateUtils. 
This stuff is @hide, @deprecated, unused, and was never in any API level.

Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
 2013-03-19 11:36:12 -07:00
Elliott Hughes
c9fe40ead5 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.
 2013-03-19 10:11:19 -07:00
Elliott Hughes
71558f1faf Merge "Fix times in debugging output to use H rather than k." 2013-03-19 16:50:39 +00:00
Elliott Hughes
bab316fea2 am e79af7df: Merge "Fix build." 
* commit 'e79af7dffbd4c41ab756c5b0888e28bbb317aab3':
  Fix build.
 2013-03-18 18:55:42 -07:00
Elliott Hughes
54519e7041 Fix build. 
(cherry-pick of 0a65ac90fae79687b46a8e70549204b97e4c951f.)

Change-Id: Idd0feede5bf5ce78f47f9a442019e68f7717a9e4
 2013-03-18 18:17:25 -07:00
Elliott Hughes
e79af7dffb Merge "Fix build." 2013-03-19 01:11:02 +00:00
Elliott Hughes
0a65ac90fa Fix build. 
Change-Id: Icb7fb60f00251ab01c8f9844572bb349e45c6c41
 2013-03-18 18:10:24 -07:00
Elliott Hughes
eda35cb7c5 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.
 2013-03-18 17:49:47 -07:00
Elliott Hughes
64a277d837 Fix times in debugging output to use H rather than k. 
Bug: 8359981
Change-Id: I4fccf3ed7e469b77f6e755dacbcd025005390505
 2013-03-18 17:47:22 -07:00
Elliott Hughes
a8974d3f0a Merge "Clean up (some of) our many clocks to use H instead of k." 2013-03-19 00:28:42 +00:00
Elliott Hughes
cdafd37f31 Clean up (some of) our many clocks to use H instead of k. 
Bug: 8359981
Change-Id: I3c0c38c2bf5adc4b5bdc11c3d10cf41dd8fb6462
 2013-03-18 17:21:33 -07:00
Scott Main
da9f385abc am 2e1e8928: am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns 
* commit '2e1e892878ea0612d6e2916ec3849cc3f30f5b72':
  add search tags for Design patterns
 2013-03-18 16:57:54 -07:00
Scott Main
2e1e892878 am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns 
* commit 'a2f808539c13efaf6bb86b607d47dcedd58bb41b':
  add search tags for Design patterns
 2013-03-18 16:55:47 -07:00
Scott Main
a2f808539c am 49e43bb8: am e21406cb: add search tags for Design patterns 
* commit '49e43bb818d3b8ff5e9c7272d5039b9d2926aac9':
  add search tags for Design patterns
 2013-03-18 16:53:56 -07:00
Scott Main
49e43bb818 am e21406cb: add search tags for Design patterns 
* commit 'e21406cb963ce00b62cebe14732f1960f877cbec':
  add search tags for Design patterns
 2013-03-18 16:52:32 -07:00
Scott Main
e21406cb96 add search tags for Design patterns 
Change-Id: I7126bbf88c2160efbca431e3e4caa612abc20bf9
 2013-03-18 15:50:55 -07:00