80025 Commits

Author SHA1 Message Date
Scott Main
ba751a0ade am f284d492: docs: fix broken links
* commit 'f284d49293aead609de5b83d601260cfd86b7978':
  docs: fix broken links
2012-07-31 14:57:37 -07:00
The Android Open Source Project
ca4117ca38 Reconcile with jb-mr0-release - do not merge
Change-Id: Ica8b95c440b5c3fe0a7d31e9633d4ac1b0e02c38
2012-07-31 14:48:19 -07:00
Scott Main
f284d49293 docs: fix broken links
Change-Id: I0523fb8eb8608b07cf7ca866d0c2ccfcbfc2e946
2012-07-31 14:19:33 -07:00
The Android Automerger
4594d8baf8 merge in jb-mr0-release history after reset to jb-dev 2012-07-31 14:07:31 -07:00
Kenny Root
194da0b8b3 am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev
* commit 'a39fdd11e80618acc046fff65b6549b5c8b5aa8d':
  Fix AccountManagerServiceTest
2012-07-31 12:34:30 -07:00
Kenny Root
a39fdd11e8 Merge "Fix AccountManagerServiceTest" into jb-dev 2012-07-31 12:32:27 -07:00
Kenny Root
ae652cc97c Fix AccountManagerServiceTest
The MockAccountAuthenticatorCache needs to implement the new method.

Bug: 6820670
Change-Id: I5d1cb3aecec63602ae4541cd01ae8e28c8328e5a
2012-07-31 12:27:32 -07:00
Alexander Lucas
cef720192a am 320b3ec2: Merge "Initial commit of wireless connectivity/discovery class." into jb-dev
* commit '320b3ec21eff971827a9032f1fb1ee7c866e4303':
  Initial commit of wireless connectivity/discovery class.
2012-07-31 11:42:59 -07:00
Alexander Lucas
320b3ec21e Merge "Initial commit of wireless connectivity/discovery class." into jb-dev 2012-07-31 11:39:53 -07:00
Kenny Root
fa74f7e04f am bba948dc: Merge "Delay AccountManagerService initialization" into jb-dev
* commit 'bba948dc9e95baab9e6fb728927aada4a00d93de':
  Delay AccountManagerService initialization
2012-07-31 11:17:11 -07:00
Kenny Root
bba948dc9e Merge "Delay AccountManagerService initialization" into jb-dev 2012-07-31 11:14:02 -07:00
Alexander Lucas
969c243f17 Initial commit of wireless connectivity/discovery class.
Change-Id: Ifbcbb8f5021a749ddb131d678ee1117835168598
2012-07-31 10:23:01 -07:00
Peter Ng
bed4354676 am 971c05a0: Merge "removing recents icon in tabs ss" into jb-dev
* commit '971c05a07b42018fa994d0f48d559838de7ed1a0':
  removing recents icon in tabs ss
2012-07-31 10:16:00 -07:00
Peter Ng
971c05a07b Merge "removing recents icon in tabs ss" into jb-dev 2012-07-31 10:13:39 -07:00
Brian Carlstrom
400918b02d am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev
* commit '4881d8d3f12efc9bdb3b4c71d117a2c53919d258':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto
2012-07-31 09:55:30 -07:00
Brian Carlstrom
4881d8d3f1 Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev 2012-07-31 09:53:28 -07:00
Peter Ng
be13fa0b7a removing recents icon in tabs ss
Change-Id: I3a8b3b33c9c90bb8a0ee28e502bbdbe3e72e62be
2012-07-31 09:41:57 -07:00
Peter Ng
0af60dfc69 am 682077d1: Merge "help image updates" into jb-dev
* commit '682077d188e8c9e7d353138401a731b9e11ebd09':
  help image updates
2012-07-31 09:41:09 -07:00
Peter Ng
f42bd7441e am 5e466ae4: Merge "new accessibility section" into jb-dev
* commit '5e466ae4fa100cfc723472b9b402b4b1dde36ce0':
  new accessibility section
2012-07-31 09:39:19 -07:00
Peter Ng
682077d188 Merge "help image updates" into jb-dev 2012-07-31 09:38:36 -07:00
Peter Ng
5e466ae4fa Merge "new accessibility section" into jb-dev 2012-07-31 09:36:25 -07:00
Kenny Root
b3e4b46db0 am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev
* commit 'e583bcf13c13957bdf20f8bc5e23258b083b2f51':
  Explicitly set lib dir permissions during unlink
2012-07-31 09:34:26 -07:00
Kenny Root
e583bcf13c Merge "Explicitly set lib dir permissions during unlink" into jb-dev 2012-07-31 09:31:41 -07:00
Nick Pelly
5dcbe638ee am 1af5ac1b: Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev
* commit '1af5ac1b6801c4da2ef689449fd1fd2eba1ff48e':
  DO NOT MERGE. Add package-name-prefix blacklist for location updates.
2012-07-31 09:20:25 -07:00
Nick Pelly
1af5ac1b68 Merge "DO NOT MERGE. Add package-name-prefix blacklist for location updates." into jb-dev 2012-07-31 09:17:54 -07:00
Brian Carlstrom
5b1f037829 Change KeyStore to use Modified UTF-8 to match NativeCrypto
Bug: http://code.google.com/p/android/issues/detail?id=35141
Bug: 6869713

Change-Id: I61cb309786960072148ef97ea5afedb33dc45f4e
2012-07-30 18:54:18 -07:00
Peter Ng
1edd4ae5c4 help image updates
Change-Id: I4357879eb365f5584efb838139132fd9f7a6e1be
2012-07-30 18:49:45 -07:00
Peter Ng
66f13d7510 am 28b452fd: Merge "dialog example update" into jb-dev
* commit '28b452fddf85de27ad88b2b5de884c8428e74f1e':
  dialog example update
2012-07-30 18:42:19 -07:00
Peter Ng
581784b342 am a5d92968: Merge "actionbar and tabs image updates" into jb-dev
* commit 'a5d929681a64fff76dcfc7b0ce3f03666cf98337':
  actionbar and tabs image updates
2012-07-30 18:42:08 -07:00
Peter Ng
28b452fddf Merge "dialog example update" into jb-dev 2012-07-30 18:39:41 -07:00
Peter Ng
a5d929681a Merge "actionbar and tabs image updates" into jb-dev 2012-07-30 18:39:41 -07:00
Peter Ng
5ac5a324b3 new accessibility section
Change-Id: I15fdc9550c9bf414f003685748f5aff71a9b4d44
2012-07-30 18:34:35 -07:00
Dirk Dougherty
6918de8f81 am 27855acc: Doc change: fix title and API level reference.
* commit '27855accec6557dade0a9cb647a235620881e946':
  Doc change: fix title and API level reference.
2012-07-30 18:18:32 -07:00
Dirk Dougherty
27855accec Doc change: fix title and API level reference.
Change-Id: Ib76edbb004ed4af0672f27e1f94dbb73716653a2
2012-07-30 18:10:08 -07:00
Peter Ng
6443ca4cd9 actionbar and tabs image updates
Change-Id: I2a0294ddc3627ddc0998de8d415fb938bc6ff86e
2012-07-30 17:53:32 -07:00
Peter Ng
bdd8d0fada dialog example update
Change-Id: Ia34dc977559fcd8bf6fe85c60ea0d328ed047e0f
2012-07-30 17:21:31 -07:00
Kenny Root
26ff6626fc Delay AccountManagerService initialization
Since applications can have Account providers, they need to be delayed
until after PackageManagerService says everything is mounted.
Otherwise the accounts associated with that provider will be removed
immediately when startup happens.

Bug: 6820670
Change-Id: Iba81765260421649f706624d0605a40ebc1347b1
2012-07-30 16:28:44 -07:00
Peter Ng
3074dad239 am 8874ab04: help, notificaion page updates and typos -changed copy to remove instances of eg
* commit '8874ab0473f4db10e71bf0537c0703db03bac4ee':
  help, notificaion page updates and typos -changed copy to remove instances of eg
2012-07-30 16:22:42 -07:00
Peter Ng
8874ab0473 help, notificaion page updates and typos
-changed copy to remove instances of eg

Change-Id: Ife1da42ffdd25ffbfe23d0315cd27df4c738e182
2012-07-30 16:08:15 -07:00
Kenny Root
515087d1c5 Explicitly set lib dir permissions during unlink
The default umask changed, so we have to explicitly set the mode of the
lib directory when we create it in unlinklib.

Bug: 6857022
Change-Id: I06fc3f29e99d686bbbb96184d8c314d4cc57e9fe
2012-07-30 15:01:20 -07:00
The Android Open Source Project
2606fc48cb Reconcile with jb-mr0-release jb-release
Change-Id: I241c11b89af86b312a9112a0004efb3ab6aaa3f6
2012-07-30 14:43:53 -07:00
Peter Ng
a3b69d1fa4 am 81a9bece: Merge "copy and image updates to patterns and building blocks" into jb-dev
* commit '81a9bece12ef855092b27c33a997f3fa7b7f2d98':
  copy and image updates to patterns and building blocks
2012-07-30 14:39:54 -07:00
Peter Ng
81a9bece12 Merge "copy and image updates to patterns and building blocks" into jb-dev 2012-07-30 14:37:26 -07:00
Nick Pelly
48c5eb018b DO NOT MERGE. Add package-name-prefix blacklist for location updates.
The Settings.Secure value locationPackagePrefixBlacklist and
locationPackagePrefixWhitelist contains comma seperated package-name
prefixes.

Location & geo-fence updates are silently dropped if the receiving
package name has a prefix on the blacklist. Status updates are
not affected. All other API's work as before.

A content observer is used so run-time updates to the blacklist
apply immediately. There is both a blacklist and a whitelist.
The blacklist applies first, and then exemptions are allowed
from the whitelist. In other words, if your package name prefix
matches both the black AND white list, then it is allowed.

Change-Id: I4ea2ad56fa6bd75d32151bc250ac25c26a5777c4
2012-07-30 13:17:30 -07:00
Adam Powell
fc92eb94c4 am 2ffb1acb: Merge " Fix preload classname for phone policy."
* commit '2ffb1acbb704fa9d87fe496d5b7f3053e02799df':
  Fix preload classname for phone policy.
2012-07-30 13:10:06 -07:00
Adam Powell
2ffb1acbb7 Merge " Fix preload classname for phone policy." 2012-07-30 10:46:12 -07:00
Adam Cohen
86371474de am 47db02ba: Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev
* commit '47db02bad8fed67025669c41ef0c0dd9cafe7ed2':
  No longer parceling FixedSizeRemoteViewsCaches
2012-07-27 17:42:30 -07:00
Adam Cohen
47db02bad8 Merge "No longer parceling FixedSizeRemoteViewsCaches" into jb-dev 2012-07-27 17:40:34 -07:00
Dirk Dougherty
9ddc6ed30f am 36e055bd: Doc change: fix typo.
* commit '36e055bd2e55d9b8f13d0d0d37259fa0ce5507d1':
  Doc change: fix typo.
2012-07-27 17:39:42 -07:00
Dirk Dougherty
36e055bd2e Doc change: fix typo.
Change-Id: Icd0d01a3047e86544dcea9188499e1433778184a
2012-07-27 17:36:07 -07:00