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

37379 Commits

Author SHA1 Message Date
kmccormick
984f94ee4c am f29ca256: am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 
* commit 'f29ca256a4340a3d550d2c4a39a2e6a29a3ce850':
  Doc update: unterminated code tags
 2013-04-03 18:03:00 -07:00
kmccormick
f29ca256a4 am 57b73b4a: am 72da7af6: am b461a13f: Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 
* commit '57b73b4a1d6ea84ae42c407ecb258829ab8dfa2c':
  Doc update: unterminated code tags
 2013-04-03 18:00:11 -07:00
kmccormick
b461a13f25 Merge "Doc update: unterminated code tags" into jb-mr1.1-docs 2013-04-04 00:52:26 +00:00
kmccormick
43d5abbf03 Doc update: unterminated code tags 
"Bug: 7250069"

Change-Id: I4c3eca8eacad6d0aced9f38788726ba95b914d5d
 2013-04-03 17:43:44 -07:00
kmccormick
9d9365916d am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit 'f57266175dffe68c5709f432dd6983c314d164f4':
  Doc update: fix broken code sample
 2013-04-03 14:26:34 -07:00
kmccormick
f57266175d am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 
* commit '2144eee3576e3fb382170f502e41f1aae572559a':
  Doc update: fix broken code sample
 2013-04-03 14:23:54 -07:00
kmccormick
91e01a4d2e Merge "Doc update: fix broken code sample" into jb-mr1.1-docs 2013-04-03 21:16:08 +00:00
kmccormick
e4ce502d77 Doc update: fix broken code sample 
"Bug: 8537853"

Change-Id: Ieedfd24c39725ce7c6975300b6471ab3ef5884ee
 2013-04-03 14:13:36 -07:00
Scott Kennedy
23eda7cd0a am 76f9a0a6: am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit '76f9a0a6800d8a8945156a95dea79f16ec704b3d':
  docs: Typos and other fixes
 2013-04-03 09:35:18 -07:00
Scott Kennedy
76f9a0a680 am c318dbcf: am 2dd01a0b: am 555c82cd: am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit 'c318dbcf358772ab53b0380edb3e487a773ad2d8':
  docs: Typos and other fixes
 2013-04-03 09:31:32 -07:00
Scott Kennedy
555c82cd43 am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev 
* commit 'f7c06ddbfc79921d389ed6699df17e54c428571e':
  docs: Typos and other fixes
 2013-04-03 09:20:38 -07:00
Scott Kennedy
f7c06ddbfc Merge "docs: Typos and other fixes" into jb-mr1-dev 2013-04-03 16:16:35 +00:00
kmccormick
cccf6e9b85 am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs 
* commit '9f0ed0ee508b8f2233c8834f067e2fb8275d2cfa':
  Doc update: clarify dumpsys instructions
 2013-03-29 16:16:10 -07:00
kmccormick
9f0ed0ee50 am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs 
* commit '58db95970c9ba47dd83e06cc165d2dc5cc29ce8a':
  Doc update: clarify dumpsys instructions
 2013-03-29 16:13:12 -07:00
kmccormick
31ed1722b1 Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs 2013-03-29 23:06:58 +00:00
kmccormick
f6dc107809 Doc update: clarify dumpsys instructions 
"Bug: 8474578"

Change-Id: Ic743de8f41a1b2d38a4d2495148dc07e2f45b8e5
 2013-03-29 16:01:31 -07:00
kmccormick
6eebd6e6b4 am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs 
* commit '6f50c846ad46dfeadf8eac389102031662ad892f':
  Doc update: incorrect method name
 2013-03-29 14:48:35 -07:00
kmccormick
6f50c846ad am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs 
* commit 'd2c1e947ea27ccea8060b0ef4509b3d6c90c4c51':
  Doc update: incorrect method name
 2013-03-29 14:46:53 -07:00
kmccormick
5018688b69 Merge "Doc update: incorrect method name" into jb-mr1.1-docs 2013-03-29 21:38:49 +00:00
kmccormick
f783ce5bcf Doc update: incorrect method name 
"Bug: 8177983"

Change-Id: Ib8f811a8e82dbff9b4e97cb670dec66342a0df00
 2013-03-29 14:33:21 -07:00
kmccormick
84bba9528c am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '297409fefcfb2704162536562db9395903476b44':
  Doc update: clarify rules for rate param
 2013-03-28 18:07:59 -07:00
kmccormick
297409fefc am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '3abd5a00ab24299de00b6dfa9c73ff59e3f3360c':
  Doc update: clarify rules for rate param
 2013-03-28 18:05:44 -07:00
kmccormick
6d9ff5033e Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 2013-03-29 01:00:11 +00:00
kmccormick
a230b3cb96 Doc update: clarify rules for rate param 
"Bug: 5581113"

Change-Id: Ic87f1c331fba2b08de295b2d77832739bf823500
 2013-03-28 17:58:57 -07:00
kmccormick
5652935aef am 5a5ff0b8: am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs 
* commit '5a5ff0b807f456055a7eadb46bca7f674585529d':
  Doc update: fix broken XML causing prob in View
 2013-03-28 17:25:18 -07:00
kmccormick
5a5ff0b807 am 6754e05b: am c1fbc91b: am a42ddee1: Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs 
* commit '6754e05b4e034a5118d669a547708c7adebd3202':
  Doc update: fix broken XML causing prob in View
 2013-03-28 17:23:03 -07:00
kmccormick
a42ddee1c2 Merge "Doc update: fix broken XML causing prob in View" into jb-mr1.1-docs 2013-03-29 00:16:21 +00:00
kmccormick
ac7122d984 Doc update: fix broken XML causing prob in View 
"Bug: 5873694"

Change-Id: I2b2a822538886825f8a863c741f2aebb665883f8
 2013-03-28 17:04:00 -07:00
kmccormick
0de7af1e18 am c9c63003: am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs 
* commit 'c9c63003b2e30c068a1bc9eba7683b75ca272180':
  Doc update: misc fixes
 2013-03-28 16:45:16 -07:00
kmccormick
c9c63003b2 am fd245a2e: am 593c0dbf: am 378d4367: Merge "Doc update: misc fixes" into jb-mr1.1-docs 
* commit 'fd245a2ed78fd2b39c6d09ad0b1d84c275544c33':
  Doc update: misc fixes
 2013-03-28 16:43:26 -07:00
kmccormick
50e27c8135 Doc update: misc fixes 
"Bug: 3424410"

Some of these had already been fixed.

Change-Id: I1d0ab3a8fa51aa308186059db4186e7a7d24e9f8
 2013-03-28 16:33:46 -07:00
kmccormick
5c3ddcd14b am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit '425c3d5f59f1e315cdbdd5f7530c4380aabf76ab':
  Doc update: superceeded > superseded
 2013-03-28 15:27:54 -07:00
kmccormick
425c3d5f59 am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 
* commit '99049335a604cae3f515fce32bc5f1b27fe8d29b':
  Doc update: superceeded > superseded
 2013-03-28 15:26:25 -07:00
kmccormick
689e827aa3 Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs 2013-03-28 22:21:12 +00:00
kmccormick
ac66b85a04 Doc update: superceeded > superseded 
"Bug: 5935672"

Change-Id: Ie2324d00d454cf3f3f3ed422dea2017b8a7a4c54
 2013-03-28 15:19:06 -07:00
Elliott Hughes
3ae3048377 am a19647d3: Merge "Correct executable bit for source files [Take 2]" 
* commit 'a19647d3d81d3bdd15ad3bc8a2ece8e7bd1095fe':
  Correct executable bit for source files [Take 2]
 2013-03-28 14:27:09 -07:00
Elliott Hughes
a19647d3d8 Merge "Correct executable bit for source files [Take 2]" 2013-03-28 20:50:34 +00:00
kmccormick
603f987f14 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
 2013-03-27 18:59:42 -07:00
kmccormick
418172bf88 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
 2013-03-27 18:57:27 -07:00
kmccormick
6e6e861a58 Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs 2013-03-28 01:49:37 +00:00
kmccormick
30498b4182 Doc change: Fix typo DONT_DELTE 
"Bug: 8273156"

Change-Id: I6ba2e780d1a8c2b7d1771e93125a10b228227020
 2013-03-27 17:56:13 -07:00
Chirayu Desai
3e4a3ea2ff Correct executable bit for source files [Take 2] 
Change Ieb51bafb46c895a21d2e83696f5a901ba752b2c5 left out some
files, this fixes them.

Change-Id: Ia949a8581668836ea0251602e048f09c852f5169
 2013-03-27 16:52:35 +05:30
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
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
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
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
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