Christopher Tate
c8459dc85e
Settings provider needs to send notifications as itself
...
... and not as its ultimate caller, who may be a less-privileged
application. Fixes bug 7188309
Change-Id: Iffd37b8da84f683bf665bf3d48c0b7fbc8dd721d
2012-09-18 13:27:36 -07:00
Jeff Sharkey
27bd34d9d9
Multi-user MTP.
...
The current MTP kernel driver at /dev/mtp_usb is exclusive, meaning
only one process can have it open. In addition, each MTP session
with a desktop requires unique object IDs, which doesn't hold true
across users on the device.
To solve these two issues, when switching users we cycle the USB host
stack to disconnect both local and remote MTP connections, giving the
new user's media process a chance to claim /dev/mtp_usb, and causing
the desktop to initiate a new MTP session.
This change also allows BroadcastReceivers to registerReceiver()
allow retrieval of a current sticky broadcast. Adds a system property
to override maximum users. Removes MOUNTED broadcasts for secondary
users. Allows INTERACT_ACROSS_USERS to getCurrentUser().
Bug: 6925114
Change-Id: I02b4a1b535af95fb2142655887b6d15a8068d18a
2012-09-18 13:26:26 -07:00
Jason Sams
a21636074a
Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev
2012-09-18 13:24:56 -07:00
Fabrice Di Meglio
d3d9f3f100
Fix bug #7173351 API REVIEW: android.util.LocaleUtil
...
Change-Id: I08fd491eff714059e9ec874fadebe7eb556c34d5
2012-09-18 12:55:32 -07:00
Jason Sams
08a81583c1
Add Kernel, Method, and field IDs
...
bug 7182873
Change-Id: I066a359bb04027e9376dac088560f042c496b10e
2012-09-18 12:32:10 -07:00
Irfan Sheriff
24ed276913
Merge "WFD fixes" into jb-mr1-dev
2012-09-18 12:22:06 -07:00
Irfan Sheriff
e0c28d5f13
WFD fixes
...
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast
Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
2012-09-18 12:20:37 -07:00
Fabrice Di Meglio
49b0a9b470
Fix bug #7172699
...
- remove @link as we are already using a @see which is doing a link by itself
Change-Id: I6ff6979bb2d960c3c980cdf0a88885b92e80fd7f
2012-09-18 12:06:13 -07:00
Geremy Condra
00bc4c0b67
Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev
2012-09-18 11:39:14 -07:00
Geremy Condra
ed41a4e2d8
Initial commit for X509TrustManagerExtensions.
...
This provides a mechanism for exposing the bells
and whistles we've attached to trust managers to
third parties.
Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600
2012-09-18 11:29:46 -07:00
Mike Lockwood
465d72073c
am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
...
* commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6':
MtpData bmp format file can't recognize when copy bmp into DUT
2012-09-18 11:01:32 -07:00
Mike Lockwood
ad23333f72
am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
...
* commit '945080b5b61e28bfc05c75ba5b2030d1e43d0f19':
MtpData bmp format file can't recognize when copy bmp into DUT
2012-09-18 10:59:27 -07:00
Scott Main
c95b1d8847
am a59b1dac: am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
...
* commit 'a59b1dacd7e7c7494692c79c31b22243e45a0ec4':
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
2012-09-18 10:57:39 -07:00
Scott Main
0f38c0887c
am 3ce6b008: am d67459ff: new Google Play badges and some updates to corresponding pages
...
* commit '3ce6b0085a20cbc6b8759f9e42649955fcdeebb9':
new Google Play badges and some updates to corresponding pages
2012-09-18 10:57:35 -07:00
Scott Main
bc95e937bf
am fe7e473d: am b574a264: am b86b7f07: small update to the ADT installation steps based on new ADT UI
...
* commit 'fe7e473d0579c20e22fd86876d92c680d5dbedf7':
small update to the ADT installation steps based on new ADT UI
2012-09-18 10:57:31 -07:00
Katie McCormick
79d977ba1f
am 04afdd68: am ad4bbdf2: am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
...
* commit '04afdd68f338ae925cec79d131ca9beff98c9cb6':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-18 10:57:27 -07:00
Scott Main
4ca7f5594b
am 6c47d0a9: am ada4f081: am 61d85c43: add link to device dock lesson
...
* commit '6c47d0a9ff3a7a2b2a64e87bb37949e214b5411b':
add link to device dock lesson
2012-09-18 10:57:24 -07:00
Dirk Dougherty
e7b5711054
am 880051db: am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights.
...
* commit '880051db778a635839fc7d491d0ae96f9c662bd1':
Doc change: fix typo in JB highlights.
2012-09-18 10:57:20 -07:00
Scott Main
81ae8e7d0a
am 08ec998b: am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support
...
* commit '08ec998bb35bf63eb5af289078556d5fb9969160':
docs: update for multi apk doc for ABI support
2012-09-18 10:57:17 -07:00
Katie McCormick
7e26ef6bbe
am 0a94b84d: am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions.
...
* commit '0a94b84def26b25cee823bf3914f6b3713622665':
Doc update: Appwidgets JB additions.
2012-09-18 10:57:13 -07:00
Scott Main
ebeb95bf47
am 21c5007e: am 8a80ac46: am 54efa69f: older not lower
...
* commit '21c5007ed4728bd170f7ae8592512c5665924c8f':
older not lower
2012-09-18 10:57:10 -07:00
Joe Fernandez
e3c672cb07
am 77ae2e6f: am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition
...
* commit '77ae2e6f27664f05e4adba18756111a698dea9f6':
docs: Accessibility DevGuide, Jelly Bean edition
2012-09-18 10:57:07 -07:00
Scott Main
9ecfb8d118
am db6313ce: am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
...
* commit 'db6313ceba2fd35efc97e9bcd4bdfc25d10093f4':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
2012-09-18 10:57:04 -07:00
Katie McCormick
f7e2e40079
am f5c717a9: am 2141c068: am 243170f7: Doc update: Fix typo.
...
* commit 'f5c717a96ce3efb4a451433dd85af80283f56934':
Doc update: Fix typo.
2012-09-18 10:57:00 -07:00
Scott Main
963b2505b9
am 5c97d966: am 9ae01846: fix broken link for action bar pack
...
* commit '5c97d966cc0e555bbf0abf4a6517d8d2c3934c72':
fix broken link for action bar pack
2012-09-18 10:56:54 -07:00
Mike Lockwood
945080b5b6
am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
...
* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
MtpData bmp format file can't recognize when copy bmp into DUT
2012-09-18 10:53:11 -07:00
Fabrice Di Meglio
b250e94fdc
Merge "Fix bug #7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev
2012-09-18 10:47:07 -07:00
Scott Main
a59b1dacd7
am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
...
* commit 'edf0ba6e1b6de8f43880267862e43ee461901c25':
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
2012-09-18 10:45:23 -07:00
Scott Main
3ce6b0085a
am d67459ff: new Google Play badges and some updates to corresponding pages
...
* commit 'd67459ff191aaee34d5459960ef8e1fed82f59d5':
new Google Play badges and some updates to corresponding pages
2012-09-18 10:45:19 -07:00
Scott Main
fe7e473d05
am b574a264: am b86b7f07: small update to the ADT installation steps based on new ADT UI
...
* commit 'b574a264e687385a236a42d3c95d00825845c820':
small update to the ADT installation steps based on new ADT UI
2012-09-18 10:45:15 -07:00
Katie McCormick
04afdd68f3
am ad4bbdf2: am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
...
* commit 'ad4bbdf22cc63489b541b9b8f82073e851836780':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
2012-09-18 10:45:11 -07:00
Scott Main
6c47d0a9ff
am ada4f081: am 61d85c43: add link to device dock lesson
...
* commit 'ada4f081c641b09f7e3a3c214db868f24df957e9':
add link to device dock lesson
2012-09-18 10:45:07 -07:00
Dirk Dougherty
880051db77
am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights.
...
* commit '2dec992884db8ca54ee814b4c7967c358dcd8212':
Doc change: fix typo in JB highlights.
2012-09-18 10:45:04 -07:00
Scott Main
08ec998bb3
am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support
...
* commit 'a1981bc1ab96cd6e1c7dcb66225a5890e6a04805':
docs: update for multi apk doc for ABI support
2012-09-18 10:45:00 -07:00
Katie McCormick
0a94b84def
am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions.
...
* commit '917d45e3d1a2d405aa0996889c40554b4a508fe1':
Doc update: Appwidgets JB additions.
2012-09-18 10:44:57 -07:00
Scott Main
21c5007ed4
am 8a80ac46: am 54efa69f: older not lower
...
* commit '8a80ac469050135ce2c126bc690e352522b7cee3':
older not lower
2012-09-18 10:44:53 -07:00
Joe Fernandez
77ae2e6f27
am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition
...
* commit 'b9b05dfcc1deba0e5daefe13231327432cdb6cc3':
docs: Accessibility DevGuide, Jelly Bean edition
2012-09-18 10:44:50 -07:00
Scott Main
db6313ceba
am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
...
* commit '0cc7398ab9196cf3ae8075f8e7bd055a900ebb2e':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
2012-09-18 10:44:46 -07:00
Katie McCormick
f5c717a96c
am 2141c068: am 243170f7: Doc update: Fix typo.
...
* commit '2141c06849cb5b2f5bea06a79de66b7de4112ac9':
Doc update: Fix typo.
2012-09-18 10:44:42 -07:00
Scott Main
5c97d966cc
am 9ae01846: fix broken link for action bar pack
...
* commit '9ae018462a5fa44e3e1d4837942b5fd880531124':
fix broken link for action bar pack
2012-09-18 10:44:32 -07:00
Mike Lockwood
1e86994cd0
Merge "MtpData bmp format file can't recognize when copy bmp into DUT"
2012-09-18 10:25:42 -07:00
Adam Powell
a4b0e5590d
Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev
2012-09-18 10:25:00 -07:00
Adam Powell
8b1821979b
Use a larger scaling span for larger screen devices.
...
Change-Id: I67486e65799c076fc9ac150f67a6be715c2ed4d0
2012-09-18 10:23:43 -07:00
Craig Mautner
0cbfcffe7b
Add debug for b/7094175.
...
Change-Id: Iec83b9350bfeb804dfe3da25986138c2dbaa6d45
2012-09-18 10:19:49 -07:00
Baligh Uddin
76a10e86ca
Import translations. DO NOT MERGE
...
Change-Id: I52f25aba49edd4070c02b351adefeeb764e15866
Auto-generated-cl: translation import
2012-09-18 10:15:46 -07:00
Jean-Baptiste Queru
4529146642
am 7f5de016: Skip f5cbd762 - it\'s in frameworks/opt/telephony
...
* commit '7f5de0161b4df9fc8ed817b10a258668ec7513a2':
Show plmn in emergency call allowed mode.
2012-09-18 10:07:09 -07:00
Baligh Uddin
900d551478
Import translations. DO NOT MERGE
...
Change-Id: I5949e565716c891ce4aeb0c3a630831a062912b9
Auto-generated-cl: translation import
2012-09-18 09:58:05 -07:00
Marco Nelissen
c5a6cdeb14
Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev
2012-09-18 09:44:56 -07:00
Andy McFadden
923c18b142
Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev
2012-09-18 09:23:30 -07:00
Nick Kralevich
96b6cf9eb0
Merge "Adjust FAQ." into jb-mr1-dev
2012-09-18 09:22:00 -07:00