OSDN Git Service
Svetoslav Ganov [Tue, 3 Sep 2013 16:24:48 +0000 (09:24 -0700)]
Crashes in TouchExplorer on two finger swipe.
1. The logic for finding the active pointer was incorrect. The code was
iterating over all pointer ids and taking the minimum, i.e. the pointer
that first went down. The problem was that the down time for pointers
that are not down was also considered (set to zero), thus sometimes we
would consider the first pointer that went down to be a pointer that
is not down at all. Now we are iterating only over the pointers that
are down.
2. The batched events while waiting to see if the user is exploring or
gesturing were added even if we were in touch exploration state at which
point we do not have to batch. As a result we ended up having lefovers
from a previous gesture when handling the delayed events and crash.
bug:
10312546
Change-Id: I4728541ac12e4da4577d22e4314101dd169a52fb
The Android Automerger [Tue, 3 Sep 2013 13:00:22 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Svetoslav Ganov [Tue, 3 Sep 2013 07:24:57 +0000 (07:24 +0000)]
Merge "System print service enabled after every system reboot" into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:55 +0000 (03:50 +0000)]
Merge "Filter roots based on incoming request." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:27 +0000 (03:50 +0000)]
Merge "New recents behavior to match spec." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:10 +0000 (03:50 +0000)]
Merge "Instance state, fix sharing, Durable objects." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 03:50:00 +0000 (03:50 +0000)]
Merge "Use Cursors directly when binding documents." into klp-dev
Jeff Sharkey [Tue, 3 Sep 2013 00:19:40 +0000 (17:19 -0700)]
Filter roots based on incoming request.
When incoming request is for local-only content, or for ACTION_CREATE,
only include roots advertise those features.
Filters roots based on the allowed MIME types and the supported types
advertised by each root. This supports displaying Images and Audio
roots only when requesting those content types. Applies the same
filter when deciding which roots to query for recents.
Fixes advanced filtering instead of limiting to just devices. Update
sorting so that Recent always appears first. Add testing support for
LOCAL_ONLY.
Bug:
10597317,
10526535
Change-Id: Ic5ccf475c4fe93fd52b29388d369d7f6915c0c42
Jeff Sharkey [Tue, 3 Sep 2013 00:07:17 +0000 (00:07 +0000)]
Merge "Refactoring of DocumentsContract." into klp-dev
Svetoslav Ganov [Mon, 2 Sep 2013 22:24:45 +0000 (15:24 -0700)]
System print service enabled after every system reboot
The system was overriding the user on every boot by turing of all system
print services, i.e. service that are on the system image. Now the system
print service are enabled by default only once per user, the user can later
disable them and the system does not override that. We now have a system
setting with the services we enabled once by default so we never do
default enabling again (unless device is wiped).
bug:
10594775
Change-Id: Id3129ccfba95bf57375ea9fec0b5ca0e51bda199
Jeff Sharkey [Mon, 2 Sep 2013 22:07:28 +0000 (15:07 -0700)]
New recents behavior to match spec.
Updated behavior queries each documents root for recently modified
documents. It uses a new variant of DirectoryLoader which limits the
maximum number of parallel queries to relieve memory pressure. When
first started, it waits up to 500ms for everyone to finish, then
publishes whatever results are ready, and then refreshes results as
each straggler finishes.
New RootCursorWrapper that always blends in authority and rootId
columns, which are used for binding root details from blended cursors.
Bug:
10593596,
10329994
Change-Id: Icc0d4a2f1b6166edc72f78a4c88f444eeba6f2f0
Przemyslaw Szczepaniak [Mon, 2 Sep 2013 15:41:05 +0000 (16:41 +0100)]
Fix SynthesisRequest javadoc
Bug:
10548784
Change-Id: I76a89bb9accdeee00c60a668adbdd789b995cd92
The Android Automerger [Mon, 2 Sep 2013 13:01:11 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
satok [Mon, 2 Sep 2013 05:49:42 +0000 (05:49 +0000)]
Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev
Jeff Sharkey [Mon, 2 Sep 2013 01:41:04 +0000 (18:41 -0700)]
Instance state, fix sharing, Durable objects.
Remember instance state across configuration changes, and enable
rotation. This remembers current modes and in-progress traversals.
Always finish action modes after launching an action. Fix sharing
by always putting Uris in extras, and always wrap in a chooser. Find
common MIME types when sharing multiple documents. Fix downloads
launching by following directory MIME type change.
Introduce "Durable" which is like Parcelable, but can be used for
both byte[] storage and Parcel transport. Make both DocumentInfo
and DocumentStack durable.
Disable recents until new behavior is implemented.
Bug:
10460236,
10446265,
10533674,
10456344,
10456702
Change-Id: I4eaf2b0b4cde611c69a1e7b5f1586f6b02019b27
Jeff Sharkey [Sun, 1 Sep 2013 04:27:44 +0000 (21:27 -0700)]
Use Cursors directly when binding documents.
Instead of creating a DocumentInfo for every list item, bind the
adapter against Cursor directly.
Create new SortingCursorWrapper which performs sorting at query time
and keeps a O(1) mapping from sorted to unsorted positions in the
underlying Cursor.
Suppress extra loader passes that had been kicked off. Use unstable
provider when querying to guard against broken providers.
Bug:
10567506,
10510851
Change-Id: I535814da6b17c38de04a1175e0afcc78c6b966ce
Jeff Sharkey [Sat, 31 Aug 2013 22:02:20 +0000 (15:02 -0700)]
Refactoring of DocumentsContract.
Combines related columns and constants onto the same class so they
are easier to discover. Move back to surfacing roots with columns
so they are consistent with documents.
Advanced roots are represented with a flag instead of distinct
types. Flags to indicate supporting of well-known media types,
instead of arbitrary an MIME filter. Reintroduce well-formed rootId
to support recents.
Always use the expanded version of "documents" in constants, methods,
and argument names.
Refactor DocumentProvider method names to clearly distinguish if
a single item or multiple could be returned, and of which type. Add
documentation to clearly define which methods have already been
overridden.
Bug:
10567506,
10567557
Change-Id: I981f26ab82f2b520a19aa1ce66f659de50d7fac0
John Spurlock [Sat, 31 Aug 2013 14:59:31 +0000 (14:59 +0000)]
Merge "Status bar icons as expressions of white." into klp-dev
Ed Tam [Sat, 31 Aug 2013 01:14:59 +0000 (18:14 -0700)]
am
468c60b3: (-s ours) am
00e4c672: am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
468c60b334321d5790b0b5bd962870939aac0ab2':
Telephony: SMS over IMS, DO NOT MERGE
John Spurlock [Sat, 31 Aug 2013 00:53:26 +0000 (20:53 -0400)]
Status bar icons as expressions of white.
Bug:
10502089
Change-Id: Id13badd6c729b79492aec5370dbb3dc2479008fd
Alan Viverette [Fri, 30 Aug 2013 23:58:08 +0000 (23:58 +0000)]
Merge "Update internal AutoScrollHelper to match support lib version" into klp-dev
Kenny Root [Fri, 30 Aug 2013 23:21:25 +0000 (23:21 +0000)]
Merge "Use core-tests-support instead of core-tests" into klp-dev
Kenny Root [Thu, 29 Aug 2013 21:27:20 +0000 (14:27 -0700)]
Use core-tests-support instead of core-tests
The core-tests-support library is newly created. It doesn't have any
tests itself but some support for tests that need to use mocked classes
for testing. In this case, some tests are using TestKeyStore for SSL
testing in frameworks tests.
(cherry picked from commit
c2d6728350f3ec80f9b4c8967794558e42516987)
Bug:
10092469
Change-Id: Ib38364c607de5a98eb242050eaaf52b22ab8ca57
Matthew Williams [Fri, 30 Aug 2013 21:39:15 +0000 (21:39 +0000)]
Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev
Alan Viverette [Fri, 30 Aug 2013 21:34:42 +0000 (21:34 +0000)]
Merge "Update captioning APIs" into klp-dev
Alan Viverette [Fri, 30 Aug 2013 21:33:13 +0000 (14:33 -0700)]
Update internal AutoScrollHelper to match support lib version
BUG:
10547956
Change-Id: I7d5b1b9fb89ae8ff4294cc2dfd01e29b55ed3eba
Matthew Williams [Tue, 20 Aug 2013 22:32:20 +0000 (15:32 -0700)]
DO NOT MERGE. Remove service component for KLP.
1) As discussed, lack of internal clients -> remove SyncService
component from KLP. This CL reverts that addition.
2) Also includes javadoc cleanup of existing API.
3) Fix naming of allowMetered() -> disallowMetered() in API
4) Removed one-off sync in the future, as it doesn't make sense
for sync adapters.
Change-Id: I1b17094e6edafb2955cdfb99f39b44274fbe86f9
Jesse Hall [Fri, 30 Aug 2013 20:49:14 +0000 (13:49 -0700)]
EGL10.eglCreateWindowSurface should set producerControlledByApp
Bug:
10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
Vinit Deshapnde [Fri, 30 Aug 2013 19:31:25 +0000 (12:31 -0700)]
Synchronize access to single supplicant path
Both wlan0 and p2p0 state machines are accessing the supplicant socket
simultaneously; and may get responses of each other's command. This
change introduces synchronization between these two processes.
Bug:
10375978
Change-Id: I0ac0b2771311b642affc353958cc9ba2e5dd5716
Jeff Hao [Fri, 30 Aug 2013 21:10:40 +0000 (21:10 +0000)]
Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev
Jesse Hall [Fri, 30 Aug 2013 21:09:12 +0000 (21:09 +0000)]
Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
Ed Tam [Fri, 30 Aug 2013 21:06:47 +0000 (14:06 -0700)]
am
00e4c672: am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
Telephony: SMS over IMS, DO NOT MERGE
Ed Tam [Fri, 30 Aug 2013 21:04:45 +0000 (14:04 -0700)]
am
f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '
f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
Telephony: SMS over IMS, DO NOT MERGE
Ed Tam [Fri, 30 Aug 2013 20:50:35 +0000 (20:50 +0000)]
Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
Jesse Hall [Fri, 30 Aug 2013 20:49:14 +0000 (13:49 -0700)]
EGL10.eglCreateWindowSurface should set producerControlledByApp
Bug:
10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
Jim Miller [Fri, 30 Aug 2013 19:55:38 +0000 (19:55 +0000)]
Merge "Attempt to fix missing clock bug" into klp-dev
Vinit Deshapnde [Fri, 30 Aug 2013 19:48:12 +0000 (19:48 +0000)]
Merge "Synchronize access to single supplicant path" into klp-dev
Vinit Deshapnde [Fri, 30 Aug 2013 19:31:25 +0000 (12:31 -0700)]
Synchronize access to single supplicant path
Both wlan0 and p2p0 state machines are accessing the supplicant socket
simultaneously; and may get responses of each other's command. This
change introduces synchronization between these two processes.
Bug:
10375978
Change-Id: I0ac0b2771311b642affc353958cc9ba2e5dd5716
Jonathan Dixon [Fri, 30 Aug 2013 19:15:41 +0000 (19:15 +0000)]
Merge "Remove WebViewClassic specific test code" into klp-dev
Zhentao Sun [Fri, 30 Aug 2013 19:11:28 +0000 (19:11 +0000)]
Merge "Fixed b/
10512887." into klp-dev
John Spurlock [Fri, 30 Aug 2013 15:29:50 +0000 (11:29 -0400)]
Add a few SystemUI xxhdpi stragglers.
Bug:
10316062
Change-Id: I1307d7188e8326407c562a1f65f100e6a3dca5ed
John Spurlock [Fri, 30 Aug 2013 11:08:57 +0000 (07:08 -0400)]
Improve signal assets against tranparent bkgrnd.
And update ringer icons, restoring their previous optical bounds.
Bug:
10546772
Change-Id: If05a1cd674453b496d25dddfe185783abec93f5e
Wink Saville [Thu, 29 Aug 2013 23:42:44 +0000 (16:42 -0700)]
Add debug and remove SocketTimeoutException.
Bad merge from jb-mr2 to klp, the SocketTimeoutException
in isCaptivePortal should not be present. Also add debug
for bug
9972012. The SocketTimeoutException is a possible
cause of
9972012 but the logs from post #24 it was not
caused by a timeout, so this is not a fix.
Bug:
9972012
Change-Id: I290518832f8258d4682821815834f5621245b643
John Spurlock [Fri, 30 Aug 2013 00:47:03 +0000 (20:47 -0400)]
Remove unused status bar help and obsolete resources.
Bug:
10502089
Change-Id: I813244c4d5535256a56b242b92e6373edbbaba93
Svetoslav Ganov [Wed, 28 Aug 2013 21:37:54 +0000 (14:37 -0700)]
Print spooler security and some new print service facing APIs.
1. Updated the security mode of the print spooler. Now the spooler
is not signed with the system key, it is not a privileged app so if
it gets compromised (PDF rendering is a potential attack vector)
it cannot access dangerous permissions. Also only the system
can bind to the spooler.
2. Added APIs for asking a print service to start and stop tracking
a given printer. This is need for the case when the user selects
the printer and the print service should do a best effort to keep
the system updated for the current state of the printer.
3. Added APIs for putting a print job in a blocked state. A print
service would report the print job as blocked if for some reason
the printer cannot proceed, e.g. 99 pages are printed but there
is no paper for the last one. The user has to add more paper
and the print service can resume the job.
4. Changed the read/write APIs to use ParcelFileDescriptor instead
of FileDescriptor since the latter does not have a clean API for
detaching the wrapped Linux file descriptor when one wants to
push it to native.
5. Added API for getting the size of the printed document so the
print service can avoid handling big filed over cellular network
or ask the user if needed.
6. Now the print services that are preinstalled on the system image
are automatically enabled.
Change-Id: Ia06c311d3d21cabb9e1368f13928e11cd0030918
Wink Saville [Thu, 29 Aug 2013 21:57:08 +0000 (14:57 -0700)]
Merge commit '
270226b0' into manualmerge
* commit '
270226b0':
Add support for handling mobile provisioning networks.
Conflicts:
core/java/android/net/CaptivePortalTracker.java
core/java/android/net/ConnectivityManager.java
core/java/android/net/IConnectivityManager.aidl
core/java/android/net/MobileDataStateTracker.java
core/res/AndroidManifest.xml
services/java/com/android/server/ConnectivityService.java
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
John Spurlock [Thu, 29 Aug 2013 17:56:31 +0000 (13:56 -0400)]
More SystemUI asset updates.
White close handles, a few missed xx items.
Bug:
10502089
Change-Id: I788f3698249e72c3df3d039c68b438998db1b978
Jeff Hao [Thu, 29 Aug 2013 18:19:39 +0000 (11:19 -0700)]
Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
Bug:
9968521
Change-Id: Ic63340e0d2fef18f27fdfabdd056ac5304c3d54f
(cherry picked from commit
ffbe799f3824f4be705ca726988355d3943a9004)
Fabrice Di Meglio [Fri, 30 Aug 2013 18:00:19 +0000 (18:00 +0000)]
Merge "Fix bug #
10549094 KLP API Review: android.util.LayoutDirection" into klp-dev
Selim Gurun [Fri, 30 Aug 2013 17:09:22 +0000 (17:09 +0000)]
Merge "DO NOT MERGE Printing API changes for supporting better page layout" into klp-dev
John Spurlock [Fri, 30 Aug 2013 15:29:50 +0000 (11:29 -0400)]
Add a few SystemUI xxhdpi stragglers.
Bug:
10316062
Change-Id: I1307d7188e8326407c562a1f65f100e6a3dca5ed
Selim Gurun [Thu, 29 Aug 2013 19:01:27 +0000 (12:01 -0700)]
DO NOT MERGE Printing API changes for supporting better page layout
Bug:
10507857
Change-Id: I3120ebfd11716259b9a83312b95a6a3f98a23d89
John Spurlock [Fri, 30 Aug 2013 11:08:57 +0000 (07:08 -0400)]
Improve signal assets against tranparent bkgrnd.
And update ringer icons, restoring their previous optical bounds.
Bug:
10546772
Change-Id: If05a1cd674453b496d25dddfe185783abec93f5e
Ben Murdoch [Fri, 30 Aug 2013 09:03:58 +0000 (09:03 +0000)]
Merge "Fix for
10530176 - CookieSyncManager must be created by WebView c'tor" into klp-dev
Wink Saville [Fri, 30 Aug 2013 03:30:51 +0000 (03:30 +0000)]
Merge "Add debug and remove SocketTimeoutException." into klp-dev
Jim Miller [Fri, 30 Aug 2013 02:12:26 +0000 (02:12 +0000)]
Merge "Disable hotword detection on low-memory devices" into klp-dev
Jim Miller [Fri, 30 Aug 2013 01:58:21 +0000 (18:58 -0700)]
Disable hotword detection on low-memory devices
Change-Id: If21f852af36a8f6dea17f3a87b22f39db3d1d6e8
Fabrice Di Meglio [Fri, 30 Aug 2013 01:05:02 +0000 (18:05 -0700)]
Fix bug #
10549094 KLP API Review: android.util.LayoutDirection
- use constant class instead of an interface
- make it final
Change-Id: I1bde76eb84cd92427e4e1fc2483cdecec429ae99
John Spurlock [Fri, 30 Aug 2013 00:47:03 +0000 (20:47 -0400)]
Remove unused status bar help and obsolete resources.
Bug:
10502089
Change-Id: I813244c4d5535256a56b242b92e6373edbbaba93
Matthew Williams [Fri, 30 Aug 2013 00:24:11 +0000 (00:24 +0000)]
Merge "Turn off debugging in SyncManager" into klp-dev
Jason Sams [Fri, 30 Aug 2013 00:03:35 +0000 (00:03 +0000)]
Merge "Cleanup API typo" into klp-dev
Jason Sams [Fri, 30 Aug 2013 00:00:37 +0000 (17:00 -0700)]
Cleanup API typo
bug
10548782
Change-Id: I3654b7d1f8ea10eb51006804248cc2a7d20eabb0
Zhentao Sun [Thu, 29 Aug 2013 21:43:35 +0000 (14:43 -0700)]
Fixed b/
10512887.
This is an issue caused by multi-threading. If geofence provider service
is connected and disconnected immediately, the ServiceWatcher can return a
null service handle to the private thread used by GeofenceProxy, and
this can cause NPE and system crash.
This CL also fixed a hidden race conditions bug where mGeofenceHardware
is not synchronized between two threads.
Change-Id: I824642cd638fbb1e6799a5a1220b047ebc2556a1
Wink Saville [Thu, 29 Aug 2013 23:42:44 +0000 (16:42 -0700)]
Add debug and remove SocketTimeoutException.
Bad merge from jb-mr2 to klp, the SocketTimeoutException
in isCaptivePortal should not be present. Also add debug
for bug
9972012. The SocketTimeoutException is a possible
cause of
9972012 but the logs from post #24 it was not
caused by a timeout, so this is not a fix.
Bug:
9972012
Change-Id: I290518832f8258d4682821815834f5621245b643
Robert Greenwalt [Thu, 29 Aug 2013 23:17:49 +0000 (23:17 +0000)]
Merge "Don't show roaming icon for specific operators" into klp-dev
Svetoslav Ganov [Thu, 29 Aug 2013 22:59:08 +0000 (22:59 +0000)]
Merge "Print spooler security and some new print service facing APIs." into klp-dev
Svetoslav Ganov [Wed, 28 Aug 2013 21:37:54 +0000 (14:37 -0700)]
Print spooler security and some new print service facing APIs.
1. Updated the security mode of the print spooler. Now the spooler
is not signed with the system key, it is not a privileged app so if
it gets compromised (PDF rendering is a potential attack vector)
it cannot access dangerous permissions. Also only the system
can bind to the spooler.
2. Added APIs for asking a print service to start and stop tracking
a given printer. This is need for the case when the user selects
the printer and the print service should do a best effort to keep
the system updated for the current state of the printer.
3. Added APIs for putting a print job in a blocked state. A print
service would report the print job as blocked if for some reason
the printer cannot proceed, e.g. 99 pages are printed but there
is no paper for the last one. The user has to add more paper
and the print service can resume the job.
4. Changed the read/write APIs to use ParcelFileDescriptor instead
of FileDescriptor since the latter does not have a clean API for
detaching the wrapped Linux file descriptor when one wants to
push it to native.
5. Added API for getting the size of the printed document so the
print service can avoid handling big filed over cellular network
or ask the user if needed.
6. Now the print services that are preinstalled on the system image
are automatically enabled.
Change-Id: Ia06c311d3d21cabb9e1368f13928e11cd0030918
Adam Powell [Thu, 29 Aug 2013 22:38:24 +0000 (22:38 +0000)]
Merge "GridLayout changes for API council" into klp-dev
Matthew Williams [Thu, 29 Aug 2013 20:41:15 +0000 (13:41 -0700)]
Turn off debugging in SyncManager
Bug:
10549076
Change-Id: I63ad8af5fbe8736eb7ca8307a4beef5310a1c10c
quddusc [Thu, 29 Aug 2013 22:16:01 +0000 (15:16 -0700)]
am
ee9d38ff: am
40765a4a: am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
ee9d38ff24358774d194108128e99f09d08ddf8e':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Wink Saville [Thu, 29 Aug 2013 22:10:51 +0000 (22:10 +0000)]
Merge "Merge commit '
270226b0' into manualmerge" into klp-dev
Adam Powell [Thu, 29 Aug 2013 21:56:51 +0000 (14:56 -0700)]
GridLayout changes for API council
* Hide set/getPrinter methods. A change/addition like this should
happen for all views if it happens, not just for one specific view.
* Follow Android style guidelines for fields.
Bug
10549037
Change-Id: I1823d7bbbd8bcc678c5be2358ca23a8dc6dbfd15
(cherry picked from commit
916159461bf17e13c245a709935a0d1133e0ed91)
Wink Saville [Thu, 29 Aug 2013 21:57:08 +0000 (14:57 -0700)]
Merge commit '
270226b0' into manualmerge
* commit '
270226b0':
Add support for handling mobile provisioning networks.
Conflicts:
core/java/android/net/CaptivePortalTracker.java
core/java/android/net/ConnectivityManager.java
core/java/android/net/IConnectivityManager.aidl
core/java/android/net/MobileDataStateTracker.java
core/res/AndroidManifest.xml
services/java/com/android/server/ConnectivityService.java
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Amith Yamasani [Thu, 29 Aug 2013 21:45:04 +0000 (21:45 +0000)]
Merge "Improve Intent disambig dialog behavior" into klp-dev
duho.ro [Wed, 10 Jul 2013 03:01:06 +0000 (12:01 +0900)]
uicc : add config_stkNoAlphaUsrCnf to config.xml
Per 3GPP specification 102.223,
if the alpha identifier is not provided by the UICC,
the terminal MAY give information to the user.
set to false if we need to show user confirmation
when alpha identifier is not provided by the UICC.
Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f
Conflicts:
core/res/res/values/config.xml
Jason Sams [Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)]
Merge "Unhide USAGE_IO_INPUT functions" into klp-dev
Craig Mautner [Thu, 29 Aug 2013 21:14:30 +0000 (21:14 +0000)]
Merge "Reset activity's "return to home" flag on relaunch" into klp-dev
Martijn Coenen [Thu, 29 Aug 2013 21:01:16 +0000 (21:01 +0000)]
Merge "Add an API for querying HCE service selection mode." into klp-dev
Jason Sams [Thu, 29 Aug 2013 20:30:59 +0000 (13:30 -0700)]
Unhide USAGE_IO_INPUT functions
Change-Id: I9c1a7e5d65adee133b99b9a94729ab0b3d5a097f
Martijn Coenen [Thu, 29 Aug 2013 02:23:41 +0000 (19:23 -0700)]
Add an API for querying HCE service selection mode.
This allows applications to differentiate between
the case where another app is the default, or the
case where the selection mode is "Ask every time".
Also, parse new requireDeviceUnlock attribute in
ApduServiceInfo.
Bug:
10262585
Change-Id: Icac508fe00054132574731532c05a1138edb24f5
Martijn Coenen [Thu, 29 Aug 2013 19:56:00 +0000 (19:56 +0000)]
Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
Craig Mautner [Thu, 29 Aug 2013 19:24:56 +0000 (12:24 -0700)]
Reset activity's "return to home" flag on relaunch
When relaunching an activity re-evaluate the flag that determines
whether to return to the next activity on the stack or to the home
activity upon return.
Fixes bug
10545580.
Change-Id: I5868ce1b494afffcc5afc22abe3b65aa339827bb
Alan Viverette [Thu, 29 Aug 2013 19:23:48 +0000 (12:23 -0700)]
Update captioning APIs
CaptioningManager is now a first-class service in Context and can
have listeners added to it to monitor changes.
BUG:
10260603,
10461210
Change-Id: I2df5b2997537bb343d902b7ace3343ad483f3717
Sungmin Choi [Fri, 19 Jul 2013 04:36:29 +0000 (13:36 +0900)]
Don't show roaming icon for specific operators
bug:
9896815
bug:
10100304
bug:
10097969
bug:
10101601
Conflicts:
core/res/res/values/config.xml
Change-Id: I6165f42b2a3d7f4bbd16c97f7a2b8760a688e2d4
Igor Murashkin [Thu, 29 Aug 2013 18:59:10 +0000 (18:59 +0000)]
Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev
quddusc [Thu, 29 Aug 2013 18:57:52 +0000 (11:57 -0700)]
am
40765a4a: am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
40765a4a5300914e8c7ce7ed6397cec7ab8d78a1':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Vineeta Srivastava [Thu, 29 Aug 2013 18:41:27 +0000 (18:41 +0000)]
Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev
duho.ro [Wed, 10 Jul 2013 03:01:06 +0000 (12:01 +0900)]
uicc : add config_stkNoAlphaUsrCnf to config.xml
Per 3GPP specification 102.223,
if the alpha identifier is not provided by the UICC,
the terminal MAY give information to the user.
set to false if we need to show user confirmation
when alpha identifier is not provided by the UICC.
Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f
Conflicts:
core/res/res/values/config.xml
quddusc [Thu, 29 Aug 2013 18:12:44 +0000 (11:12 -0700)]
am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
2ef3952d8e62b71baca176b3e17315a37facd34a':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
John Spurlock [Thu, 29 Aug 2013 18:03:58 +0000 (18:03 +0000)]
Merge "More SystemUI asset updates." into klp-dev
John Spurlock [Thu, 29 Aug 2013 17:56:31 +0000 (13:56 -0400)]
More SystemUI asset updates.
White close handles, a few missed xx items.
Bug:
10502089
Change-Id: I788f3698249e72c3df3d039c68b438998db1b978
Geoffrey Borggaard [Thu, 29 Aug 2013 17:54:37 +0000 (17:54 +0000)]
Merge "UserManagerService upgrades users on first restart." into klp-dev
quddusc [Fri, 21 Jun 2013 23:49:46 +0000 (16:49 -0700)]
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Change-Id: Idce540108d048d76fc2c4bc37ecf2118b82588c5
Isaac Katzenelson [Thu, 29 Aug 2013 17:52:31 +0000 (17:52 +0000)]
Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
Sam Blitzstein [Wed, 28 Aug 2013 22:44:03 +0000 (15:44 -0700)]
Add ACTION_SHOW_ALARMS to Clock API
Add in an action to jump to the alarms page of a clock app.
Helpful for quick settings, for example.
Bug:
10506871
Change-Id: Ia18708c7962543911864dfaefa17d5356eed1b45
Wink Saville [Thu, 29 Aug 2013 17:26:06 +0000 (10:26 -0700)]
am
8cb2f42e: am
948282b0: Add support for handling mobile provisioning networks.
* commit '
8cb2f42eea2ef3b249528aa7913fc7a6dfc6b741':
Add support for handling mobile provisioning networks.
Wink Saville [Thu, 29 Aug 2013 17:22:55 +0000 (10:22 -0700)]
am
948282b0: Add support for handling mobile provisioning networks.
* commit '
948282b0e6cf5310f09db97a4ae939db7c1cef72':
Add support for handling mobile provisioning networks.
Leon Scroggins III [Thu, 29 Aug 2013 17:12:00 +0000 (17:12 +0000)]
Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
Geoffrey Borggaard [Thu, 29 Aug 2013 02:11:10 +0000 (22:11 -0400)]
UserManagerService upgrades users on first restart.
This causes all restriction pins to be reset.
Bug:
10535070
Change-Id: Ia2abf904505514d7e555b420c2b032a0094e0643
Wink Saville [Thu, 29 Aug 2013 15:55:16 +0000 (08:55 -0700)]
Add support for handling mobile provisioning networks.
When a sim is new or it has expired it needs to be provisioned
with the carrier. Basically provisioning is associating a sim with
a user account. When a sim isn't provisioned then operators will
restrict access to the network and only allow certain addresses
or services to be used.
This set of changes allows two types of provisioning networks to be
recognized. The first is a network that causes all DNS lookups to be
redirected to a different address than was intended. This is exemplified
by how T-Mobile works.
The second technique uses a special apn for provisioning. An example is
AT&T where lwaactivate is the provisioning apn and broadband is the
normal apn. We first try broadband and if we are unable to connect we
try lwaactivate. When we see the activate we identify it as special and
the ApnContext.isProvisioningApn will return true.
In the future our plan is to create a new network type that can be added
to the apn list, but for now it identified by name.
Here is a list of significant changes:
- CaptivePortalTracker now only test WiFi networks instead of all networks
- checkMobileProvisioning checks for provisioning networks and doesn't
try to ping.
- IConnectivityManager.aidl changes:
* getProvisioningOrActiveNetworkInfo was added to and used by Manage
mobile plan in WirelessSettings so even when there is no active
network it will still allow provisioning. Otherwise it would report
no internet connection.
* setSignInErrorNotificationVisible is used by both
CaptiviePortalTracker and checkMobileProvisioning so they use the
same code for the notifications.
* checkMobileProvisioning was simplified to have only a timeout as
returning the result is now harder as we abort simultaneous call
otherwise we'd could get into loops because we now check every time
we connect to mobile.
- Enhanced MDST to handle the provisioning network.
- Added CONNECTED_TO_PROVISIONING_NETWORK to NetworkInfo to make a new
state so we don't announce to the world we're connected.
- TelephonyIntents.ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN
is sent by the low level data connection code to notify Connectivity
Service that a provisioning apn has connected. This allows CS to
handle the connection differently than a normal connection.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5