OSDN Git Service
Craig Mautner [Tue, 6 Aug 2013 19:56:50 +0000 (19:56 +0000)]
Merge "Extend clearing of mLastPausedActivity."
Jeff Brown [Tue, 6 Aug 2013 19:31:22 +0000 (19:31 +0000)]
Merge "Minor style cleanups."
Jeff Sharkey [Tue, 6 Aug 2013 18:42:17 +0000 (18:42 +0000)]
Merge "Storage roots in fragment, sectioned."
Jean-Michel Trivi [Tue, 6 Aug 2013 18:40:55 +0000 (18:40 +0000)]
Merge "Reorder and comment MediaFocusControl code"
Jeff Sharkey [Tue, 6 Aug 2013 18:26:10 +0000 (11:26 -0700)]
Storage roots in fragment, sectioned.
Move storage roots into a fragment, since it's not a drawer on
tablets. Cluster and sort roots when displaying. SectionedListAdapter
to make clustered roots easier to manage. Add docs for root types.
Move roots cache into separate class to make it easier to share.
Change-Id: Ia0b92eade059e816324641f600c08026c0e268c9
Amith Yamasani [Tue, 6 Aug 2013 18:20:55 +0000 (18:20 +0000)]
Merge "Remove restrictions PIN for all users"
Amith Yamasani [Tue, 6 Aug 2013 18:18:53 +0000 (11:18 -0700)]
Remove restrictions PIN for all users
Bug:
10200097
Change-Id: I4d95cd49a21e8f4f6b2c141d1205f81622c395b5
Alan Viverette [Tue, 6 Aug 2013 18:18:05 +0000 (18:18 +0000)]
Merge "Avoid creating new objects when DateView updates time"
Jean-Michel Trivi [Tue, 6 Aug 2013 17:42:45 +0000 (10:42 -0700)]
Reorder and comment MediaFocusControl code
Change-Id: Iacc03a7233789bd1588e9f7d2ca5df10a756fb0d
Dirk Dougherty [Tue, 6 Aug 2013 17:37:14 +0000 (10:37 -0700)]
am
c5663c9f: am
8154d293: am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
c5663c9f7cdd33e163f745bf4e65e141ca233537':
Doc change: Updated reference docs for Google Play Services 3.2.
David Christie [Tue, 6 Aug 2013 17:28:49 +0000 (17:28 +0000)]
Merge "Revert "Fix broken unit test""
David Christie [Tue, 6 Aug 2013 17:28:03 +0000 (17:28 +0000)]
Revert "Fix broken unit test"
This reverts commit
0ca981fe42c43a4b7c345f4a0a2b3b2a519be5da.
Change-Id: I67f5e7227a8a874158c4f0954e62a77a317f1edd
David Christie [Tue, 6 Aug 2013 16:56:16 +0000 (16:56 +0000)]
Merge "Fix broken unit test"
Zhijun He [Mon, 5 Aug 2013 21:56:11 +0000 (14:56 -0700)]
ImageReader: Add RGB format support.
Bug:
10155122
Change-Id: Id53d6ec815488e73bde6ca62b42c92d16bc813c9
Dirk Dougherty [Tue, 6 Aug 2013 16:32:56 +0000 (09:32 -0700)]
am
8154d293: am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
8154d2932a3e4f9800eeff18da640fda7a169ec8':
Doc change: Updated reference docs for Google Play Services 3.2.
Dirk Dougherty [Tue, 6 Aug 2013 16:30:12 +0000 (09:30 -0700)]
am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
58c68d77596dc81ac6715c8bc7785d1cc430929f':
Doc change: Updated reference docs for Google Play Services 3.2.
Craig Mautner [Tue, 6 Aug 2013 15:44:42 +0000 (08:44 -0700)]
Extend clearing of mLastPausedActivity.
Add more locations where mLastPausedActivity must be set null before
calling resumeTopActivityLocked().
Also separate the "No History" activity from mLastPausedActivity by
adding mLastNoHistoryActivity. This is necessary because now
mLastPausedActivity will be null when mLastNoHistoryActivity
is checked.
Continues to fix bug
10022212.
Change-Id: Ida543b0638c865127691dc51a6e0635062539659
Dirk Dougherty [Tue, 6 Aug 2013 07:35:27 +0000 (07:35 +0000)]
Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
Yorke Lee [Tue, 6 Aug 2013 03:42:06 +0000 (03:42 +0000)]
Merge "Add DEMOTED and UNDEMOTE TO ContactsContract"
Jeff Brown [Tue, 6 Aug 2013 03:39:29 +0000 (20:39 -0700)]
Minor style cleanups.
A few changes to demonstrate a slightly cleaner way to write
JNI code in the framework especially when multiple types are
involved. We use this pattern in many other places outside
of the media stack.
Added more detail to the UnsupportedOperationException that
occurs when buffer formats don't match.
Change-Id: Ic894dc1bd71b387f1be6ea1798fa59e533e9574f
Jeff Sharkey [Tue, 6 Aug 2013 03:15:07 +0000 (03:15 +0000)]
Merge "More recents work; filtering and sorting."
Jeff Sharkey [Tue, 6 Aug 2013 00:56:48 +0000 (17:56 -0700)]
More recents work; filtering and sorting.
Update DirectoryFragment to render List<Document>, making it more
general purpose. Feed it documents either from a backend Cursor or
after resolving fields from a recents Cursor. Start in recents when
no persisted stack available. Synthesize a root for recents.
Local directory filtering and sorting using predicates and
comparators, all performed on background thread. Introduce
UriDerivativeLoader which handles ContentObserver updates while
producing a derivative work of a Cursor.
Split data model classes into separate files.
Change-Id: Idb88b4ee22c58c8e508328e678877f7e4c978533
Dianne Hackborn [Tue, 6 Aug 2013 02:12:19 +0000 (02:12 +0000)]
Merge "Whoops, not yet time to be an error."
Dianne Hackborn [Tue, 6 Aug 2013 02:07:41 +0000 (19:07 -0700)]
Whoops, not yet time to be an error.
Change-Id: I869026e1ad33b891010d556150f0b83fa97c4ac4
Elliott Hughes [Tue, 6 Aug 2013 00:54:08 +0000 (00:54 +0000)]
Merge "Remove an unused C zip API."
Wink Saville [Tue, 6 Aug 2013 00:23:01 +0000 (17:23 -0700)]
am
9fe49fc5: am
523db46f: Merge "Set subscription_mode in the database to a default value"
* commit '
9fe49fc56ef39facf7b3be5f66256bd15a87961f':
Set subscription_mode in the database to a default value
Wink Saville [Tue, 6 Aug 2013 00:20:13 +0000 (17:20 -0700)]
am
523db46f: Merge "Set subscription_mode in the database to a default value"
* commit '
523db46f6981a40e12007dbbe629bbdc47f861ba':
Set subscription_mode in the database to a default value
Dianne Hackborn [Tue, 6 Aug 2013 00:16:04 +0000 (00:16 +0000)]
Merge "Start restricting service calls with implicit intents."
Dianne Hackborn [Tue, 6 Aug 2013 00:15:16 +0000 (00:15 +0000)]
Merge "Add a new process state for "service restarting"."
Wink Saville [Tue, 6 Aug 2013 00:10:02 +0000 (00:10 +0000)]
Merge "Set subscription_mode in the database to a default value"
Dianne Hackborn [Sun, 4 Aug 2013 23:50:16 +0000 (16:50 -0700)]
Start restricting service calls with implicit intents.
The bindService() and startService() calls have always had
undefined behavior when used with an implicit Intent and there
are multiple matching services. Because of this, it is not
safe for applications to use such Intents when interacting with
services, yet the platform would merrily go about doing... something.
In KLP I want to cause this case to be invalid, resulting in
an exception thrown back to the app. Unfortunately there are
lots of (scary) things relying on this behavior, so we can't
immediately turn it into an exception, even one qualified by the
caller's target SDK version.
In this change, we start loggin a WTF when such a call happens,
and clean up some stuff in Bluetooth that was doing this behavior.
Change-Id: I62e25d07890588d2362104e20b054aebb6c0e007
Craig Mautner [Mon, 5 Aug 2013 23:18:07 +0000 (23:18 +0000)]
Merge "Clear last paused activity."
Craig Mautner [Mon, 5 Aug 2013 23:14:22 +0000 (16:14 -0700)]
Clear last paused activity.
Moving an activity to the back used to move it behind the launcher.
This meant that the test in resumeTopActivityLocked() for
mLastPausedActivity being equal to the top activity would fail after
moveTaskToBack(). In the new activity stack model the launcher is
on a different stack so if there is only one task then the test
now passes. Clearing mLastPausedActivity when moving an activity
forward now passes the test.
Fixes bug
10022212.
Change-Id: I17932d5c87d2483f13c29ae85a7067202a08f34e
Xia Wang [Mon, 5 Aug 2013 23:03:01 +0000 (16:03 -0700)]
am
3a5e2013: am
ebbcc18e: am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
3a5e2013a1296065a4674bdc43f357d3a352a6e9':
Add option for video playback test to accept media source path.
David Christie [Mon, 5 Aug 2013 22:59:54 +0000 (22:59 +0000)]
Merge "Revert icon changes in "Modify quicksettings to have new location behavior." (b/
10184973)"
Xia Wang [Mon, 5 Aug 2013 22:58:48 +0000 (15:58 -0700)]
am
ebbcc18e: am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
ebbcc18eaa8a69579fadae484630aa1ba447c031':
Add option for video playback test to accept media source path.
Xia Wang [Mon, 5 Aug 2013 22:54:41 +0000 (15:54 -0700)]
am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
4032217ee939d3b23548e83d9183306d66af6f8f':
Add option for video playback test to accept media source path.
Xia Wang [Mon, 5 Aug 2013 22:51:03 +0000 (22:51 +0000)]
Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
Fabrice Di Meglio [Mon, 5 Aug 2013 21:49:41 +0000 (21:49 +0000)]
Merge "Fix bug #
10185976 Black patch displaying in place of drop down spinner across apps"
David Christie [Mon, 5 Aug 2013 20:32:13 +0000 (13:32 -0700)]
Revert icon changes in "Modify quicksettings to have new location behavior." (b/
10184973)
This reverts icon changes in commit
03ed0127dae141d99b003ede9ba3ea937128e471.
Change-Id: I78e3af4a745dd4f182369edd9df9c296854e7762
Dianne Hackborn [Fri, 2 Aug 2013 20:40:55 +0000 (13:40 -0700)]
Add a new process state for "service restarting".
This is a process that is not actually running, but would be
if we had enough RAM.
Also rework how service stats are stored to used the nice
compact structure we are already using for processes.
And fix a bug where when we committed the current state data,
we would mistakenly write it under the name of the *next* state
that is now starting. Ouch.
Change-Id: I9f2b84b8b3f305301fd48dcd9d4e6c232abe8ef9
Elliott Hughes [Mon, 5 Aug 2013 20:27:39 +0000 (13:27 -0700)]
Remove an unused C zip API.
Change-Id: I10ae849bdedf3e3bb97547c4f9e5a20742e9d6b1
Jeff Brown [Mon, 5 Aug 2013 21:06:50 +0000 (14:06 -0700)]
Add string that was accidentally deleted.
Change-Id: I575cc0a26ab2e701a97d9fedadfb5d54d6f0d2e1
Yorke Lee [Thu, 1 Aug 2013 01:53:31 +0000 (18:53 -0700)]
Add DEMOTED and UNDEMOTE TO ContactsContract
Change-Id: I060e9ce7d5de3f32fc55ba619b9a931ef938bd7b
Baligh Uddin [Mon, 5 Aug 2013 19:55:15 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 5 Aug 2013 19:53:51 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Jean-Baptiste Queru [Mon, 5 Aug 2013 19:51:45 +0000 (19:51 +0000)]
Merge "Revert "Revert "be more robust with handling unknown sensors"""
Fabrice Di Meglio [Mon, 5 Aug 2013 19:48:14 +0000 (12:48 -0700)]
Fix bug #
10185976 Black patch displaying in place of drop down spinner across apps
This CL introduced the regression from https://googleplex-android-review.git.corp.google.com/#/c/336753/
- use "nine-patch" instead of "bitmap" where needed
- fix also a file naming issue
Change-Id: Ib28c3622809e55fc3ed543e6ef34cc3df3421510
Alan Viverette [Mon, 5 Aug 2013 19:28:19 +0000 (12:28 -0700)]
Fix build, updates current APIs
Change-Id: I34deb72207e6eb7c37dd57d781a66582cef62b95
Alan Viverette [Mon, 5 Aug 2013 18:32:20 +0000 (18:32 +0000)]
Merge "Move caption style to its own class, add presets"
Svetoslav Ganov [Mon, 5 Aug 2013 18:28:36 +0000 (18:28 +0000)]
Merge "Disable print dialog spinners if there is only one option."
Svetoslav Ganov [Mon, 5 Aug 2013 18:26:16 +0000 (11:26 -0700)]
Disable print dialog spinners if there is only one option.
Change-Id: Ic9a46c737b592aeb6f78c962a7f9d53391a2b164
Elliott Hughes [Mon, 5 Aug 2013 18:10:06 +0000 (11:10 -0700)]
am
eab8e18d: am
8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
* commit '
eab8e18d8f6f34a9d35fbb120148956789ad48a2':
If graphics wants ASCII lowercasing, it needs to ask for it.
Elliott Hughes [Mon, 5 Aug 2013 18:07:13 +0000 (11:07 -0700)]
am
8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
* commit '
8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
If graphics wants ASCII lowercasing, it needs to ask for it.
Jean-Baptiste Queru [Mon, 5 Aug 2013 18:03:28 +0000 (11:03 -0700)]
Revert "Revert "be more robust with handling unknown sensors""
This reverts commit
17548b3c70fe4f29d33367a61300f5323f5efe99.
Elliott Hughes [Mon, 5 Aug 2013 18:01:33 +0000 (18:01 +0000)]
Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
Glenn Kasten [Mon, 5 Aug 2013 18:01:26 +0000 (18:01 +0000)]
Merge "Replace run-time PCM encodings by compile-time constants"
Amith Yamasani [Mon, 5 Aug 2013 17:58:45 +0000 (17:58 +0000)]
Merge "Don't check for valid fragment when switching to another fragment"
Amith Yamasani [Mon, 5 Aug 2013 17:55:28 +0000 (10:55 -0700)]
Don't check for valid fragment when switching to another fragment
Bug:
10184429
Change-Id: I09b39682d907a1cd7ce140e0be0faaddfaba6bd1
Glenn Kasten [Mon, 5 Aug 2013 17:27:29 +0000 (17:27 +0000)]
Merge "Explicitly compare raw pointers to NULL"
Elliott Hughes [Mon, 5 Aug 2013 17:23:20 +0000 (17:23 +0000)]
Merge "Remove member "m" prefix from now local variables"
Baligh Uddin [Mon, 5 Aug 2013 16:47:33 +0000 (09:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0799c647e037d672f16c11d39489926a4938e71f
Auto-generated-cl: translation import
Baligh Uddin [Mon, 5 Aug 2013 16:40:55 +0000 (09:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I110088e783f0d1e6768cf72ab72ba5733c1648bf
Auto-generated-cl: translation import
Glenn Kasten [Mon, 5 Aug 2013 16:35:59 +0000 (16:35 +0000)]
Merge "Remove dead code in AudioTrack JNI"
Glenn Kasten [Mon, 5 Aug 2013 16:22:07 +0000 (16:22 +0000)]
Merge "Don't doubly initialize fields in constructor"
Glenn Kasten [Mon, 5 Aug 2013 16:18:25 +0000 (16:18 +0000)]
Merge "Clean up imports"
Glenn Kasten [Mon, 5 Aug 2013 15:55:33 +0000 (15:55 +0000)]
Merge "Clean up throws in AudioRecord and AudioTrack"
John Spurlock [Mon, 5 Aug 2013 13:18:53 +0000 (13:18 +0000)]
Merge "Collapse/disable shade when hiding status bar window."
Satoshi Kataoka [Mon, 5 Aug 2013 08:12:28 +0000 (17:12 +0900)]
Open an internal utility of InputMethodUtils
Change-Id: I240e914bc21efce8554145619c403d547a17ad19
Svetoslav Ganov [Mon, 5 Aug 2013 04:08:46 +0000 (04:08 +0000)]
Merge "Polish the print spooler loading of stored print jobs."
Svetoslav Ganov [Mon, 5 Aug 2013 03:17:52 +0000 (20:17 -0700)]
Polish the print spooler loading of stored print jobs.
1. The singleton print spooler isntance is created when the print spooler
service gets a connection to the system and is destroyed when this
connection is removed. Note that if the spooler has work, then the
connection to the system will not be removed.
When the spooler is created, it reads the stored state and notifies the
system which in turn dispatches this to the print services.
When the system connects to the spooler and passes it a connection, we
schedule a delayed check whether there is work for the spooler. We do
not handle this immediately to avoid intermitted spinning on and off
of the spooler process if a client makes a sequence of queries while
the spooler has really no work.
2. Fixed a bug in the NotificationManagerService where adding a notification
and removing it immediately after that does not remove the notification.
The code that is adding a notification is run on a handler thread while
the code to remove it on the calling thread. This creates a race and
erroneous results. Now the removal is also scheduled on the handler.
3. Many small fixes here and there.
Change-Id: I6415c253139fa6616393fbe23c659d031a29e1f6
Chris Wren [Sun, 4 Aug 2013 05:04:35 +0000 (01:04 -0400)]
disable notification scorer by default.
Bug:
10163077
Change-Id: Icd03786dfe59cb26281738ae0be28d14cb5741f9
Craig Mautner [Sat, 3 Aug 2013 22:32:04 +0000 (22:32 +0000)]
Merge "Add force default orientation."
Dianne Hackborn [Sat, 3 Aug 2013 06:43:31 +0000 (23:43 -0700)]
resolved conflicts for merge of
c8911ddd to master
Change-Id: I790b547268a23848577199256fc5abc9bdb7abb8
Jeff Brown [Sat, 3 Aug 2013 04:11:14 +0000 (21:11 -0700)]
Add debug message to help diagnose a presentation bug.
Bug:
10154780
Change-Id: I0e711a6316cb231ec48fc31d87b8cbd5d857c2f8
Jeff Brown [Sat, 3 Aug 2013 02:03:49 +0000 (19:03 -0700)]
Support public virtual displays.
Refactor the new private virtual display API to also support
creating public virtual displays with various characteristics.
This feature requires special permissions and is only intended
for use by the system.
Change-Id: I44dd19f37cf76ea6d6e313afe42f4a412bd96663
Brian Carlstrom [Sat, 3 Aug 2013 02:49:15 +0000 (19:49 -0700)]
Remove member "m" prefix from now local variables
Change-Id: I7808cafc1f74c47fcd9d9a4b6a90fb50951457b1
Jeff Brown [Sat, 3 Aug 2013 01:14:46 +0000 (18:14 -0700)]
Add support for secure overlay displays for development.
Change-Id: I426115ec5a3fbda52a481097731abc8b3d9013a4
Dianne Hackborn [Sat, 3 Aug 2013 02:32:13 +0000 (19:32 -0700)]
am
373a2f15: am
607b414d: Add new app ops method to reset all op modes.
* commit '
373a2f15667956ff8a00ba59b42972b9c930af92':
Add new app ops method to reset all op modes.
Dianne Hackborn [Sat, 3 Aug 2013 02:30:08 +0000 (19:30 -0700)]
am
607b414d: Add new app ops method to reset all op modes.
* commit '
607b414d0444067e166fa54d8ea37563f2715ea3':
Add new app ops method to reset all op modes.
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:58:40 +0000 (17:58 -0700)]
am
ae311f4c: am
17548b3c: Revert "be more robust with handling unknown sensors"
* commit '
ae311f4c5f86779bb681b9fa8c1122dc174fea72':
Revert "be more robust with handling unknown sensors"
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:58:37 +0000 (17:58 -0700)]
am
d07347ed: am
83485dc9: Merge "be more robust with handling unknown sensors"
* commit '
d07347eddb85fc8838071fa68c9e324eb1ae8384':
be more robust with handling unknown sensors
Elliott Hughes [Sat, 3 Aug 2013 00:58:33 +0000 (17:58 -0700)]
am
710f3e2c: am
60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
* commit '
710f3e2cc6bc2cdc2f2cddb2190823ea31efd52a':
If frameworks wants ASCII casing, it should explicity ask for it.
Elliott Hughes [Sat, 3 Aug 2013 00:58:31 +0000 (17:58 -0700)]
am
b56f10aa: am
32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it."
* commit '
b56f10aa66914aeb880c624ed6e938e1941ff820':
If media wants ASCII lowercasing, it needs to ask for it.
Dirk Dougherty [Sat, 3 Aug 2013 00:58:28 +0000 (17:58 -0700)]
am
966dc871: am
780795dc: am
b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
* commit '
966dc871ca4f1864e405d58bcc54c1f9bef703d7':
Doc change: refresh GCM reference docs.
Scott Main [Sat, 3 Aug 2013 00:58:24 +0000 (17:58 -0700)]
am
24a32c98: am
e0a85960: am
9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
* commit '
24a32c98a580281fd19f55747ea95bf554e344c3':
docs: OpenGL Training sample code fixes
Martijn Coenen [Sat, 3 Aug 2013 00:49:02 +0000 (00:49 +0000)]
Merge "NFC: Host-based card emulation APIs."
Jeff Sharkey [Sat, 3 Aug 2013 00:43:00 +0000 (00:43 +0000)]
Merge "Track and persist directory stacks; recents work."
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:42:02 +0000 (17:42 -0700)]
am
17548b3c: Revert "be more robust with handling unknown sensors"
* commit '
17548b3c70fe4f29d33367a61300f5323f5efe99':
Revert "be more robust with handling unknown sensors"
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:41:59 +0000 (17:41 -0700)]
am
83485dc9: Merge "be more robust with handling unknown sensors"
* commit '
83485dc920cdc4a6f3dd6797623f536c99f08a6c':
be more robust with handling unknown sensors
Elliott Hughes [Sat, 3 Aug 2013 00:41:57 +0000 (17:41 -0700)]
am
60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
* commit '
60ae2617b4b304fc3e45a441f87d1765714477ba':
If frameworks wants ASCII casing, it should explicity ask for it.
Elliott Hughes [Sat, 3 Aug 2013 00:41:54 +0000 (17:41 -0700)]
am
32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it."
* commit '
32c308a5f2051a62ab2fb3337d00d84e9035eb9a':
If media wants ASCII lowercasing, it needs to ask for it.
Dirk Dougherty [Sat, 3 Aug 2013 00:41:05 +0000 (17:41 -0700)]
am
780795dc: am
b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
* commit '
780795dc198c05d5a1a181c58317dc6befec861d':
Doc change: refresh GCM reference docs.
Scott Main [Sat, 3 Aug 2013 00:41:02 +0000 (17:41 -0700)]
am
e0a85960: am
9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
* commit '
e0a8596020a10c1cf6347d89fea862d41629db04':
docs: OpenGL Training sample code fixes
Jeff Sharkey [Fri, 2 Aug 2013 22:55:26 +0000 (15:55 -0700)]
Track and persist directory stacks; recents work.
Move to manual tracking of directory navigation stack so we have Uri
data to persist, instead of opaque fragment backstack. Remember
directory stacks across launches on a per-app basis.
Start recording recently opened and created files. Uniform Uri
parameter extraction utility methods in contract.
Change-Id: I79ed30ee10272bf7c53d339e797639c993f649bb
Dirk Dougherty [Sat, 3 Aug 2013 00:38:31 +0000 (17:38 -0700)]
am
b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
* commit '
b6cb0437ef0677aa4b58bb76a77dd4fdae8258e0':
Doc change: refresh GCM reference docs.
Scott Main [Sat, 3 Aug 2013 00:38:28 +0000 (17:38 -0700)]
am
9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
* commit '
9a0087f22754de40cd5be2a738600f9642a611cc':
docs: OpenGL Training sample code fixes
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:31:54 +0000 (17:31 -0700)]
Revert "be more robust with handling unknown sensors"
This reverts commit
80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
Martijn Coenen [Wed, 31 Jul 2013 03:07:47 +0000 (20:07 -0700)]
NFC: Host-based card emulation APIs.
- New INfcCardEmulation interface to allow apps to interface
with card emulation system.
- New BIND_NFC_SERVICE permission to prevent malicious apps
from binding to card emulation services.
- ApduServiceInfo is now in the framework.
- Added constants to Settings.Secure for storing defaults.
- Modified XML grammar a bit.
Change-Id: I56b3fa6b42eb5dc132c91c1386ab1e6bac779059