68890 Commits

Author SHA1 Message Date
Adam Lesinski
d9b48d5735 Fix overcounting of mobile radio
Bug:20438089
Change-Id: Ie8987cf61ef7a0cecab6d730eed7bc47eabb9eec
2015-05-05 19:19:19 -07:00
Andre Eisenbach
ab2581398c BluetoothSap class should not be public
Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67
2015-05-04 23:20:28 +00:00
George Mount
57436d3f7e Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev 2015-05-04 22:08:03 +00:00
George Mount
f586c925d5 Fix potential NPE in internal isValidTarget method.
Bug 19805383

Change-Id: Ib22d86cca5e1225b12ed39ac988824eeb9c58bbd
2015-05-04 15:01:55 -07:00
Andre Eisenbach
f455986a45 Add documentation for BluetoothSocket.getConnectionType()
Bug: 20824264
Change-Id: I58aa8f5bbe08ddb252f01f4ad187ae8741963f0b
2015-05-04 21:56:17 +00:00
George Mount
c81af1ca78 Merge "When returning, transition only existing shared elements." into mnc-dev 2015-05-04 21:48:56 +00:00
George Mount
8de1de1f04 When returning, transition only existing shared elements.
Previously all shared element names were delivered when
returning from an Activity, even if no shared elements
existed in the exiting Activity. That prevented the calling
Activity from showing a shared element that it delivered,
but will not be receiving back again until shared elements
are transfered. That leaves a weird hole in the UI.

Now only the shared elements mapped in the returning view
hierarchy are delivered to the calling Activity.

Change-Id: I481a8bc7a771d7e819871f424d22313314c9ee8b
2015-05-04 14:12:40 -07:00
George Mount
61bab469a1 Merge "Fix Visibility not changing until Animator ends." into mnc-dev 2015-05-04 20:26:48 +00:00
Alan Viverette
d38d3574d0 Merge "Always force constructors accessible during inflation" into mnc-dev 2015-05-04 19:38:57 +00:00
Jeff Sharkey
5f809e3fff Merge "Avoid NPE when fsUuid is null." into mnc-dev 2015-05-04 19:06:39 +00:00
Jeff Sharkey
c840681dbd Avoid NPE when fsUuid is null.
Bug: 20822962
Change-Id: I6340b70dba5a4f94a0f08ddfbda0190db97746f1
2015-05-04 12:04:09 -07:00
George Mount
fcfe531e74 Fix Visibility not changing until Animator ends.
Sometimes an animator will be interrupted before it starts
during a transition and the onAnimatorEnd will not be called.
In this case, we must set the final state in the onTransitionEnd.

Bug 20416564

Change-Id: I388895215ba2b1c500de3a5afcae8db1fea288f7
2015-05-04 11:37:27 -07:00
Alan Viverette
904de2ec93 Always force constructors accessible during inflation
We now correctly throw an IllegalAccessException for non-public accesses,
but we were relying on the old incorrect behavior during inflation. This
CL forces constructors to be accessible so that we emulate the old
behavior and don't crash.

Where we were already doing this, the CL moves the setAccessible() call
immediately after the getConstructor() call, since there's no point in
calling it multiple times.

Bug: 20810495
Change-Id: I63dfcb857e445f688080eea05e86ef22760ed49f
2015-05-04 10:32:57 -07:00
Jose Lima
5551aca2b8 Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 2015-05-04 16:29:30 +00:00
Geoff Mendal
cf1f2ea5a7 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-04 14:44:12 +00:00
Geoff Mendal
123db791d0 Import translations. DO NOT MERGE
Change-Id: I6371c9d043b9d5436804c4d755ecc6a645ff7119
Auto-generated-cl: translation import
2015-05-04 07:43:39 -07:00
John Reck
05dc201ff6 Merge "Remove Bitmap#getSkBitmap" into mnc-dev 2015-05-04 14:34:52 +00:00
John Reck
1641c0cb0b Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 2015-05-04 14:34:39 +00:00
Tor Norbye
335f043bdb Merge "Add permission annotations on the AccountManager" into mnc-dev 2015-05-04 14:19:20 +00:00
Tor Norbye
80b530afdb Add permission annotations on the AccountManager
Also add some @NonNull and @Nullable annotations.

Change-Id: Ia42b1af21ed14691b2268ea8b0f55d1b8b5ea2a3
2015-05-04 06:29:55 -07:00
Matthew Williams
303650c9cd Add full backup criteria to android manifest
BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce
2015-05-03 16:19:27 -07:00
Svet Ganov
ca030f8ed5 Merge "Add read cell broadcast app op - framework" into mnc-dev 2015-05-03 00:44:14 +00:00
Svet Ganov
ede431678e Add read cell broadcast app op - framework
Change-Id: Icecc9d918db55493ada7a0faa6bfcc41d4114bbd
2015-05-02 17:42:44 -07:00
Svetoslav
e9fc4cda50 Merge "Add camera app op - framework" into mnc-dev 2015-05-03 00:41:50 +00:00
Svetoslav
fbf0ecabac Add camera app op - framework
Change-Id: I17736a8abe2c6775e990b88fb3eab963f47167d0
2015-05-02 16:23:19 -07:00
Mike Lockwood
5ba44affe6 Merge "BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets" into mnc-dev 2015-05-02 16:09:47 +00:00
Geoff Mendal
d6fec943d7 Import translations. DO NOT MERGE
Change-Id: Ib21a9d53d30f304a1c82dc4f45e82f3fe27723bb
Auto-generated-cl: translation import
2015-05-01 23:27:24 -07:00
Jose Lima
4fdcc184e6 Move ContentInfoExtender from Notification.java to a support library
Bug: 20643107

Change-Id: Idabd8b0ceb4b3c63584296736e0a5015511659e7
2015-05-01 18:32:26 -07:00
Bryce Lee
13428b5079 am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev
* commit 'f626c679fdd7e44c6cf0eb2d2f6be786636a90bc':
  Add configuration to allow animations during low power mode.
2015-05-02 01:22:24 +00:00
Raph Levien
5c26876304 Merge "Expose StaticLayout.Builder publicly" into mnc-dev 2015-05-02 00:42:18 +00:00
Raph Levien
4bf4e4c801 Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev 2015-05-02 00:41:51 +00:00
Yohei Yukawa
b6bec1a403 Remove unused methods/variables/fields from Editor.java.
This CL does nothing but remove unused code.

Change-Id: Ibe7c7aa1b9bdfd4117e27cb198082e307f4d68a4
2015-05-01 23:30:35 +00:00
Mike Lockwood
8c26d843a7 BluetoothMidiService: Add support for sending SysEx messages that span multiple Bluetooth packets
Change-Id: Id56f7c82ec97b6a46258111bbfd46ab1dc14dfe9
2015-05-01 16:16:42 -07:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
Raph Levien
531c30c62b Expose StaticLayout.Builder publicly
Expose the new Builder pattern for creating StaticLayout. This allows
access to a number of features that have been available to TextView
through a hidden constructor. Some of these features have existed
for a while (mostly maxLines), while others are new (breakStrategy,
indents).

The builder is cleaner and has a better upgrade path than the old
pattern of lots of constructors with varying numbers of arguments.

Bug: 20190561
Change-Id: Ia3cd124825ab0cb469d22d1fc576ad26454545b8
2015-05-01 15:15:48 -07:00
John Reck
7c103a36f6 Remove Bitmap#getSkBitmap
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
2015-05-01 14:38:44 -07:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap*
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
2015-05-01 14:30:21 -07:00
Chris Craik
31a2d063df Revert "Revert "Merge getDisplayList and updateDisplayListIfDirty""
Fixes breakage from HwAccelerationTest

This reverts commit b2847afde24aac22c8fb804cdce0c24b8a7c40c4.

Change-Id: I762b3c9020fc1d06bac61ffa8b956049147515b1
2015-05-01 14:30:15 -07:00
Chris Craik
5c705c595d Merge "Fix build." into mnc-dev 2015-05-01 21:01:14 +00:00
Chris Craik
b2847afde2 Fix build.
Revert "Merge getDisplayList and updateDisplayListIfDirty"

This reverts commit f85d064b536d9b2028a83e21d98eac9b40b74e95.

Change-Id: I8b1566aba67c385d72759ea2aea16edcd8477813
2015-05-01 21:01:01 +00:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
2015-05-01 13:56:04 -07:00
Chris Craik
f4ff8f701f Merge "Merge getDisplayList and updateDisplayListIfDirty" into mnc-dev 2015-05-01 20:36:22 +00:00
Chris Craik
04c0f415b5 Merge "Update alpha documentation" into mnc-dev 2015-05-01 20:36:03 +00:00
Jorim Jaggi
0629a5d524 Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
2015-05-01 13:33:38 -07:00
Mathieu Chartier
9a4cdf5caa Merge "Look at map extensions before /dev/ + ashmem." into mnc-dev 2015-05-01 18:52:21 +00:00
Mathieu Chartier
9308462a59 Look at map extensions before /dev/ + ashmem.
Prevents stuff like:
dalvik-classes.dex appearing as GC overhead.

Bug: 20752953
Change-Id: Iab0935e882a5d938651ec2581845d8242aaf98af
2015-05-01 11:50:47 -07:00
Chris Wren
b1ad8e9ea0 Merge changes from topic 'tron' into mnc-dev
* changes:
  remove unused edge border dimension.
  log clear all button
2015-05-01 18:46:42 +00:00
Alan Viverette
da0d6a6b8a Merge "Correctly handle intercepted touch events in FastScroller" into mnc-dev 2015-05-01 18:30:26 +00:00
Ruben Brunk
0f2be13dc6 camera: Update Camera2 API for arbitration.
- Update documentation for new arbitration behavior.
- Ensure an appropriate error is thrown when calling
  open while an existing, higher-priority user holds
  the camera device.

Bug: 19186859
Change-Id: I486193c14b7fd5dc6ce30c1b7471669c009d64b3
2015-05-01 18:28:13 +00:00