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

102169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
d2ef1e50c4 Stop clat if it's no longer in use. 
Normally, clatd is stopped when a connection disconnects.
However, if the connection's LinkProperties change, or if the
disconnect somehow gets lost (e.g., because of bug 8486114),
then we need to stop it (and possibly restart it).

Bug: 8276725
Change-Id: Ib8ad0d653ed8d0cd70b7414bcaa8fdaef8ba5fcc
 2013-03-28 14:45:36 +09:00
kmccormick
7e81e223f5 am 9773b6e9: am f508cb7b: am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs 
* commit '9773b6e9aeb27dc0164c57e8b38673834a9474bb':
  Doc update: typo
 2013-03-27 19:26:53 -07:00
kmccormick
61c213ad54 am fcc42da4: am 7aec7790: am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs 
* commit 'fcc42da4d9e3dc6dfd98b374a03eda051a869a74':
  Doc update: use parse, not new
 2013-03-27 19:26:50 -07:00
kmccormick
9773b6e9ae am f508cb7b: am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs 
* commit 'f508cb7bdb6a994e241711f91763ac8951311e2b':
  Doc update: typo
 2013-03-27 19:24:43 -07:00
kmccormick
24b8947f62 resolved conflicts for merge of 603f987f to jb-mr2-dev 
Change-Id: I4a130dad9d4669799f5d477f67e0f9a6a04381ca
 2013-03-27 19:23:51 -07:00
kmccormick
f508cb7bdb am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs 
* commit '571c01b494be76af9291b87c09f43a0fb30b3edb':
  Doc update: typo
 2013-03-27 19:22:18 -07:00
kmccormick
571c01b494 am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs 
* commit 'a8115d06afa29146edcab5f1edca83d2c7a89f2d':
  Doc update: typo
 2013-03-27 19:20:34 -07:00
kmccormick
a8115d06af am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs 
* commit 'f65b5d085bc62382eba530179a24a1cf1a7d353d':
  Doc update: typo
 2013-03-27 19:18:43 -07:00
kmccormick
f65b5d085b Merge "Doc update: typo" into jb-mr1.1-docs 2013-03-28 02:16:05 +00:00
kmccormick
fcc42da4d9 am 7aec7790: am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs 
* commit '7aec77901b92423b835a87be88fbbf3bc5ff0c91':
  Doc update: use parse, not new
 2013-03-27 19:03:12 -07:00
kmccormick
7aec77901b am 061d4a95: am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs 
* commit '061d4a95cf924fcf113d11b2d4d001f696a65e1f':
  Doc update: use parse, not new
 2013-03-27 19:00:48 -07: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
061d4a95cf am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs 
* commit '3af7b848143bef17230674bbed79ca77d3527e8e':
  Doc update: use parse, not new
 2013-03-27 18:59:10 -07:00
kmccormick
1946eb0549 am d55e676a: am 7db86662: am 63dc67bd: am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs 
* commit 'd55e676a592442f034cfbd3a45e05ba2cbe8ff11':
  Doc Update: bug fix.
 2013-03-27 18:58:05 -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
3af7b84814 am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs 
* commit '821d4943702e49844629ae9b522383a21210a64f':
  Doc update: use parse, not new
 2013-03-27 18:57:24 -07:00
kmccormick
d55e676a59 am 7db86662: am 63dc67bd: am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs 
* commit '7db866620491b3fa09dbcf2abe097bf33a73b034':
  Doc Update: bug fix.
 2013-03-27 18:56:08 -07:00
kmccormick
19840a8d40 am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs 
* commit '65c66c74f4db7d16ccff1a67f416f74c716b3773':
  Doc change: Fix typo DONT_DELTE
 2013-03-27 18:55:51 -07:00
kmccormick
7db8666204 am 63dc67bd: am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs 
* commit '63dc67bd6b026d3590af980b5dfddd4e68fd7831':
  Doc Update: bug fix.
 2013-03-27 18:54:07 -07:00
kmccormick
65c66c74f4 am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE" into jb-mr1.1-docs 
* commit '6e6e861a58da7bc39e1fbad9ed8730c712e45123':
  Doc change: Fix typo DONT_DELTE
 2013-03-27 18:54:02 -07:00
kmccormick
821d494370 Merge "Doc update: use parse, not new" into jb-mr1.1-docs 2013-03-28 01:53:02 +00:00
kmccormick
63dc67bd6b am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs 
* commit 'b1c453f2897a9bf7dcfe71a84512877c5c6f0536':
  Doc Update: bug fix.
 2013-03-27 18:52:24 -07:00
kmccormick
b1c453f289 am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs 
* commit '353e7a2f2efa3a6d8d9538dca8f0d5d360c2a1e9':
  Doc Update: bug fix.
 2013-03-27 18:50:36 -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
353e7a2f2e Merge "Doc Update: bug fix." into jb-mr1.1-docs 2013-03-28 01:47:58 +00:00
kmccormick
be7b87c549 Doc update: use parse, not new 
"Bug: 8014259"

Change-Id: Ia7408b49303003fe87033056365cafc5b4790813
 2013-03-27 18:26:16 -07:00
kmccormick
30498b4182 Doc change: Fix typo DONT_DELTE 
"Bug: 8273156"

Change-Id: I6ba2e780d1a8c2b7d1771e93125a10b228227020
 2013-03-27 17:56:13 -07:00
Kenny Root
7ba6470f4a am 4224a4ca: am 3864aa39: Merge "Add interrupter library to simulate EINTR" 
* commit '4224a4ca85a4e7ba3f4e543ee52c643405464164':
  Add interrupter library to simulate EINTR
 2013-03-27 17:45:21 -07:00
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
kmccormick
fcb261fc4a Doc update: typo 
"Bug: 8324430"

Change-Id: I45027ede97157552722049fdf49a7659f293237a
 2013-03-27 17:25:41 -07:00
Dianne Hackborn
a6470d4514 Merge "Fix build." into jb-mr2-dev 2013-03-28 00:20:27 +00:00
Dianne Hackborn
7039738f81 Fix build. 
Change-Id: I38a25dc63107fc907a520169e1b58f00e51dbb9d
 2013-03-27 17:19:35 -07:00
kmccormick
d0615ed1bd Doc Update: bug fix. 
"Bug: 7541616"

Change-Id: I7b84eaa13a8f695585211035647fa88614bb1372
 2013-03-27 17:18:57 -07:00
Kenny Root
3864aa3944 Merge "Add interrupter library to simulate EINTR" 2013-03-28 00:16:31 +00:00
Nick Kralevich
98ea19ed24 Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev 2013-03-28 00:13:45 +00:00
Nick Kralevich
5992898755 Merge "Add buildPermissionRequestIntent to PackageManager" into jb-mr2-dev 2013-03-28 00:11:26 +00:00
Nick Kralevich
828c16f140 Reenable optional permissions parsing and expose APIs 
Modify the package parsing code to understand optional permissions
(android:required="false"). This is essentially a rollback of
e824120016248bcfe3962883fe9f3b0481dd1c3d with some minor changes.

Expose the requestPermission API to third party apps. This allows
an app to request an Intent which, when passed to
startActivityForResult, will prompt the user to approve permissions
for an app.

In the event we decide to not launch with this feature, this change
can be rolled back.

Change-Id: Ie3626deae9b16e510323f94a2c80377f7c84b26f
 2013-03-27 16:57:33 -07:00
Nick Kralevich
035f80d7c7 Add buildPermissionRequestIntent to PackageManager 
Add the buildPermissionRequestIntent API to PackageManager. This allows
an app to request an Intent which, when passed to
startActivityForResult, will prompt the user to approve permissions
for an app.

Currently, the API is @hide.  It will be unhidden in a future change.

Change-Id: I4ec677002afa799a6eb5c2657c28452c91012436
 2013-03-27 16:55:27 -07:00
Dianne Hackborn
bf20aa767e Merge "Keep track of who has disabled applications." into jb-mr2-dev 2013-03-27 23:32:36 +00:00
Fabrice Di Meglio
f7fa08b702 Merge "Fix bug #8487785 Notification shade has text overlapping the icon" into jb-mr2-dev 2013-03-27 22:15:59 +00:00
Irfan Sheriff
c75195ae4b Merge "Notify user only when device provisioned" into jb-mr2-dev 2013-03-27 22:12:20 +00:00
Fabrice Di Meglio
02a7d5637c Fix bug #8487785 Notification shade has text overlapping the icon 
- follow up to the fix for bug #8480245 ViewGroup layout margins can be wrong in RTL mode
- deal with "RTL compatibility mode": if left/right margins are not defined and if we
haev some start/end ones then use the start/end ones.

Change-Id: I98fe3276de2bd14f60a1c423a47569a68046f7be
 2013-03-27 15:12:06 -07:00
Adam Powell
6ceed12a6c Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev 2013-03-27 22:07:18 +00:00
Lorenzo Colitti
cdee9727e2 Merge "Make isHostRoute match only host routes" into jb-mr2-dev 2013-03-27 21:59:10 +00:00
Jeff Brown
44bed6af1d Merge "Disable some noisy error logs." into jb-mr2-dev 2013-03-27 21:57:33 +00:00
Jeff Sharkey
dde8661317 Merge "Sync APIs use seconds instead of ms." into jb-mr2-dev 2013-03-27 21:48:43 +00:00
Jeff Sharkey
51366be80f Sync APIs use seconds instead of ms. 
Bug: 7668972
Change-Id: I7b253fe17d9539695adc474a69546645586b5f1a
 2013-03-27 14:46:55 -07:00
Irfan Sheriff
07a2295a4d Notify user only when device provisioned 
Make sure the notification about scan mode being availabe is only shown
when device is already provisioned

Bug: 8482739
Change-Id: If8a76ffcc0401b846e39b02a55ea69743303c93d
 2013-03-27 14:40:46 -07:00
Tim Murray
8ff0201ad0 Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev 2013-03-27 21:32:31 +00:00
Tim Murray
275812c2bb Revert "Remove all public mention of RS graphics from docs." 
This reverts commit d72f932b8cbf461ebb79c249ce92b9b811122190

Change-Id: I056b13d0b2beb508e4215bc0d289cf3e76a3a986
 2013-03-27 21:31:28 +00:00