111093 Commits

Author SHA1 Message Date
Santos Cordon
04dfb5ec3c Protecting against NPE with null country detector.
bug:10514454
Change-Id: I316c47eddbe4929599866a3f9da9129d0056e3e2
2013-08-27 16:45:37 -07:00
Igor Murashkin
d901c03375 media: ImageReader throws OutOfResourcesException when out of buffers
Bug: 10507939
Change-Id: I34c66485695ad6141388be85903cbecb9ebaa5ab
2013-08-27 16:42:24 -07:00
Rika Brooks
35df98d01a Telephony: SMS over IMS, DO NOT MERGE
Add RIL_REQUEST_IMS_REGISTRATION_STATE, RIL_REQUEST_IMS_SEND_SMS, and
RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED.  Add FORMAT_UNKNOWN to
SmsConstants.

Bug: 9626411
Change-Id: I87ca9841b4ace931c55e2d379fe6d7589b2dc8a5
2013-08-27 16:15:49 -07:00
Martijn Coenen
bbbc8660cd Merge "Add NFC reader-mode API." into klp-dev 2013-08-27 23:08:56 +00:00
Zhijun He
e2a11bb74d ImageReader: Fix null listener case
Only do the handler check when listener is not null.

Bug: 10360518
Change-Id: I9940942ae95a492c92e028e5f862beea16e1da80
2013-08-27 16:02:21 -07:00
Alan Viverette
3d1b3cb9d9 Merge "Add documentation to onTouchEvent for accessibility" into klp-dev 2013-08-27 22:48:03 +00:00
Sreeram Ramachandran
d8d4c51e3b Merge "Fix channel set option in wifi batch scan command." into klp-dev 2013-08-27 22:45:30 +00:00
Alan Viverette
1955a5b531 Add public API for obtaining drag-to-open listener
BUG: 10457019
Change-Id: I66485521c54b82033044834e7aab6707a3049e6b
2013-08-27 15:45:16 -07:00
John Spurlock
4bf5c0e242 Remove unreferenced assets from SystemUI.
Bug:10502089
Change-Id: I9c414ff88054a764ab56f70ae8a0c0c82c248be9
2013-08-27 17:53:08 -04:00
Sreeram Ramachandran
268f329521 Fix channel set option in wifi batch scan command.
Fix by not including extraneous delimiters, and changing the delimiter from a
space to a comma.

Bug: 10444428
Change-Id: Ia3197045d44a2f959316935ae085575500e65459
2013-08-27 14:49:23 -07:00
Martijn Coenen
c20ed2ff12 Add NFC reader-mode API.
Allows applications to temporarily force the NFC controller
to only do tag discovery. This will allow Android applications
to read and interact with devices that employ HCE.

Bug: 10360259
Change-Id: I709ead9a26f8e6ae8582cc295d82bd896e7c5bba
2013-08-27 14:32:53 -07:00
Craig Mautner
61f0f9ada5 Merge "When adding a window evaluate all tasks." into klp-dev 2013-08-27 21:20:52 +00:00
Craig Mautner
ac738a25f8 Merge "Hide stackId from prying eyes." into klp-dev 2013-08-27 21:20:30 +00:00
Christopher Tate
d381680b63 Merge "Make sure to actually log when Log.wtf() hiccups" into klp-dev 2013-08-27 21:15:03 +00:00
Christopher Tate
941adc95e1 Make sure to actually log when Log.wtf() hiccups
Bug 10494724

Change-Id: I687d7df73a8f4594d42955f100d928e98bbd9b30
2013-08-27 14:10:44 -07:00
Sandeep Siddhartha
572ec4e88c Merge "Temporary disable Hotword on lockscreen" into klp-dev 2013-08-27 20:31:32 +00:00
Sandeep Siddhartha
c4c330156e Temporary disable Hotword on lockscreen
Change-Id: Icdddcc0308b9f3153172e34a8f4d051c58829653
2013-08-27 13:25:40 -07:00
Craig Mautner
018be3da7b When adding a window evaluate all tasks.
Previously the code was adding a window based only on the tasks on
the stack belonging to the window being added. But if a window from
another stack was on top the window would be added out of order.

In particular when there was a dialog over the launcher app and the
device was rotated, the launcher window was being added over the
dialog. This caused the launcher icons to obscure the dialog and for
the dialog buttons to be untouchable.

Fixes bug 9984067.

Change-Id: I9a57eb641d118f4a90e98af8ca77127ab5364e79
2013-08-27 13:25:17 -07:00
John Spurlock
373bc29292 Merge "Fix NPE for devices w/out soft-nav." into klp-dev 2013-08-27 20:16:30 +00:00
John Spurlock
f6b639773c Fix NPE for devices w/out soft-nav.
And fix other places w/out null guards in PhoneStatusBar.

Bug:10507892
Change-Id: I1be1b4c88bedd097530fd44d3506b716957f9c14
2013-08-27 16:12:54 -04:00
Chet Haase
f1c3f28eb9 Merge "Fix NPE when setting new LayoutTransition" into klp-dev 2013-08-27 19:50:43 +00:00
Leon Scroggins III
ca32021b43 Replace stream wrap-function w/ more specific ones
The current stream wrapper returns a potentially incorrect
value for a call to getLength(), is typically copied into
another stream (not always in the same way), and doesn't
always take advantage of its underlying data (like when it
is an Asset). The overall goal of this CL is to provide the
caller with something that is ready to use, depending on
what is asked for. If a copy is desired, the copy is made
before being returned to the caller.

core/jni/android/graphics/Bitmap.cpp:

    Include SkStream.h, since it is no longer included by
    CreateJavaOutputStreamAdaptor's header file.

core/jni/android/graphics/BitmapFactory.cpp:

    Pass an SkStreamRewindable to decoding functions, as Skia
    decoders will be updated to only take an SkStreamRewindable
    (which makes more sense because they require rewinding).

    Call the more specific GetRewindableStream to get a
    rewindable stream.

    Remove copyAssetToStream which has been moved to Utils.

    In nativeDecodeAsset, pass forcePurgeable as allowPurgeable
    in doDecode. Technically the old code worked, but it checked
    the BitmapOptions again.

    Remove getFDSize, which is no longer used.

core/jni/android/graphics/BitmapRegionDecoder.cpp:

    Remove redundant buildSkMemoryStream. nativeNewInstanceFromStream
    now calls CopyJavaInputStream, which handles the copy.

    Copy the Asset directly, using common code, rather than creating
    an AssetStreamAdaptor to copy.

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp:
core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h:

    Provide new interfaces to access data from a Java InputStream.
    The new interfaces are more specific about what type of stream
    is desired.

    Use forward declarations where possible.

    Remove doSize, which gives a misleading answer to the question
    of how long the entire stream is.

    TODO: Only call FindClass etc once.

core/jni/android/graphics/Movie.cpp:

    Check for an asset stream, and use it if possible. Then call
    GetRewindableStream if there is not an asset.
    Remove the memory leak. Call DeleteLocalRef to delete the
    allocated memory.

core/jni/android/graphics/Picture.cpp:

    Call the new interface.

core/jni/android/graphics/Utils.cpp:
core/jni/android/graphics/Utils.h:

    Make AssetStreamAdaptor inherit from SkStreamRewindable so it
    can be passed to Skia decoding functions once they require it.

    Add CopyAssetToStream (moved from BitmapFactory.cpp) so it can
    be used by multiple files.

graphics/java/android/graphics/BitmapFactory.java:

    Remove the call to mark, which is now done natively.

    Remove the BufferedInputStream. Mark/reset is now handled
    by native code.

    Allow decodeStream to handle a FileInputStream by using the
    FileDescriptor, if it is seekable. In decodeFileDescriptor,
    call nativeDecodeStream instead of decodeStream so this new
    functionality will not loop.

    Call setDensityFromOptions in decodeFileDescriptor.

graphics/java/android/graphics/BitmapRegionDecoder.java:

    Remove the BufferedInputStream. Mark/reset is now handled
    by native code.

TODO: ADD TESTS!

Requires https://googleplex-android-review.googlesource.com/#/c/344317/

BUG=https://b.corp.google.com/issue?id=8432093

Change-Id: I4419b70b3482325c98ecc673dbfc4613f1b18581
2013-08-27 15:28:58 -04:00
Chet Haase
fee6f2b3d3 Fix NPE when setting new LayoutTransition
ViewGroup.setLayoutTransition() has logic to cancel a previously-running
transition and remove the ViewGroup's listener from that transition. However,
it is possible for the transition to be set to null on the ViewGroup on the
cancel() call, making the next call to remove the listener crash with an NPE.

The fix is to use a temporary variable to hold the old reference and
not depend on the class instance variable remaining valid/non-null across
the call to cancel().

Issue #10488932 Hangout NPE in ViewGroup.setLayoutTransition on initiating a new conversation
Issue #10509201 ViewGroup.setLayoutTransition(null) causes crash when being called in LayoutTransition.TransitionListener.endTransition()

Change-Id: I7c181b79e6601024c93a8dc246d32b751f78b216
2013-08-27 12:22:29 -07:00
Fabrice Di Meglio
6d7771b575 Merge "Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev 2013-08-27 19:04:13 +00:00
Svetoslav Ganov
aec1417ca9 Print APIs update.
1. Added scale to fit and scale to fill fitting modes.

2. Added APIs for a print app to specify which constraints imposed
   by the print attributes were satsified during a layout so they
   are not handled by the printer again, e.g. if the content is to
   be in landscape the the app generated such content the printer
   should rotate the content again.

3. Added some printer statuses.

4. Added a helper class that generates PDF documents with correct
   size based on the passed in print attributes.

5. Exposed a ctor for PageRange which was hidden by mistake and apps
   could not create page ranges. Added API for changing the printer
   status.

Change-Id: If1334a61d2d931027b98075f653018d456b1b768
2013-08-27 11:56:18 -07:00
John Spurlock
e47193d8e1 Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
And add more colour to the docs.

Bug:10460791
Change-Id: I703d927101bb034ba6dd061e6afd3e1946440fe5
2013-08-27 14:53:21 -04:00
Tom O'Neill
aeda265c4d Merge "Remove or reduce visibility of deprecated methods" into klp-dev 2013-08-27 18:23:18 +00:00
Chris Wren
d220a830f4 Merge "Change DBG to false to eliminate logcat messages." into klp-dev 2013-08-27 18:20:44 +00:00
Svetoslav Ganov
6b8c69edd2 Merge "Update AccessibilityNodeInfo API as per API council request" into klp-dev 2013-08-27 18:14:01 +00:00
Tom O'Neill
7f6f45723a Remove or reduce visibility of deprecated methods
- Fix additional getInt() path, restores the location settings screen
functionality.

- Should fix "unresolved link" build breakages in
git_klp-dev-plus-aosp-without-vendor, which is much more persnickety than
klp-dev for some reason.

- Add warning that we may add additional location modes in the future.

- Finish fix for b/10461763 and b/10461474

Change-Id: Id7155e3a0d7526a377d446018ef3bdb057bad3a6
2013-08-27 10:53:15 -07:00
John Spurlock
107e2d418b Merge "Allow wallpaper to extend into the entire screen." into klp-dev 2013-08-27 17:19:35 +00:00
John Spurlock
ef4adae5de Allow wallpaper to extend into the entire screen.
Previously it was constrained to displayInfo.appWidth/appHeight
which comes from PWM.getNonDecorDisplayWidth/Height, which includes
the nav bar.

Also adjust window layout to entire screen.

This allows wallpaper to extend into the navigation bar region,
important if the nav bar is hidden or transparent.

Bug:10505328
Change-Id: Ia6057b9c57b476a48f3b2d8b6368fd631e944a3e
2013-08-27 12:56:41 -04:00
Eino-Ville Talvala
fb3d78118b Merge "Camera2: Add CameraDevice#flush()" into klp-dev 2013-08-27 16:49:04 +00:00
Tom O'Neill
4a9c7fec66 Merge "Address API council comments on location mode API council" into klp-dev 2013-08-27 15:44:16 +00:00
Svetoslav Ganov
cb8ed39b3f Update AccessibilityNodeInfo API as per API council request
bug:10461302

Change-Id: I9709a271ab3720e064b98c79c0950d811fe37b73
2013-08-27 08:26:13 -07:00
John Spurlock
ec566dd06f Merge "Update system bar assets to new style." into klp-dev 2013-08-27 15:05:27 +00:00
John Spurlock
e189f662df Update system bar assets to new style.
Update to new system bar assets (ic_*, stat_*).

Update color resources driving style for battery meter + clock.

Add new xxhdpi versions.

Bug:10502089
Change-Id: Ic957ad9886fbb05ed0ca1765fb9e324bfd8ab609
2013-08-27 10:52:08 -04:00
Jason Monk
a8220a73c5 Don't clear Global Proxy on boot.
Doesn't clear the global proxy when a deprecated one is not found because
there still may be a non-deprecated global proxy present.

Bug: 10457179
Change-Id: I68e6d5aee7b4940f9315484060c7d82cb8ccfa70
2013-08-27 10:51:24 -04:00
Tom O'Neill
42aa4ad688 Merge "Address API Review for SettingInjectorService" into klp-dev 2013-08-27 14:35:43 +00:00
Lorenzo Colitti
703187f765 Merge "Add a simple test for NetworkManagementService." into klp-dev 2013-08-27 04:08:54 +00:00
Sandeep Siddhartha
4e22b851be Merge "Touch up the Hotword API" into klp-dev 2013-08-27 02:24:25 +00:00
satok
15ab6b016c Improve the API document for supportsSwitchingToNextInputMethod
Bug: 10461455
Change-Id: I0d3c5d3cd40f7ad057970fddd141bfd838e246f4
2013-08-27 11:08:24 +09:00
Sandeep Siddhartha
407d794a9d Touch up the Hotword API
- Few comments got missed from the last review

Change-Id: I933912c51794875be5d129351d4f06bc040537a6
2013-08-26 18:01:34 -07:00
Ying Wang
b240578f03 Fix docs build.
Change-Id: I7bfcfea052de6959230bb361400e760eab35b78c
2013-08-26 17:48:22 -07:00
Sandeep Siddhartha
b0a17400cb Merge "Add Service API to perform Hotword recognition" into klp-dev 2013-08-27 00:38:40 +00:00
Sandeep Siddhartha
637cc45809 Add Service API to perform Hotword recognition
Change-Id: I855330b255a12cce309aa11e0b7cde5b8e061043
2013-08-26 17:32:16 -07:00
Vinit Deshapnde
ca91579350 Merge "Increase sampling data size limits" into klp-dev 2013-08-27 00:23:10 +00:00
Chet Haase
be6cf71dc5 Merge "Tweak visibility logic for inflated view scenarios" into klp-dev 2013-08-26 23:29:35 +00:00
Chet Haase
35a457a3ba Tweak visibility logic for inflated view scenarios
Previously, Visibility would determine whether a given view was
worthy of a transition by checking the visibility of that view's
parent hierarchy. This is done to avoid fading every view in
a hierarchy when only the top-most node should be faded.

However, the logic was flawed because it assumed the end scene
parent was stable between scenes, which is not the case with inflated
layout scenes, in which the parent views are not the same, even though they
may represent the same parents (via ids).

The new approach is to check information on both the start and end scene
parents, and to take ids into account when checking the state of these
parents in the start/end scenes. Also, avoid this logic altogether if the
transition is targeted at specific views (don't bother checking the
parents if the transition was told to fade specific views).

Issue #10442447 Transitions: Fades don't happen correctly in some situations

Change-Id: Icea24b892f2eff2d37c6436ccfe4e288aac84178
2013-08-26 16:04:11 -07:00
Adam Powell
04e3a14c2d Merge "Expand documentation around ViewParent#childHasTransientStateChanged" into klp-dev 2013-08-26 22:32:04 +00:00