194632 Commits

Author SHA1 Message Date
Jeff Brown
797b3d2e9c Merge "Don't request traversals when updating display brightness." into mnc-dev 2015-06-10 21:15:32 +00:00
Jun Mukai
b3aa575e3b Merge "Specifies the new height/width for update() on ListPopupWindow.show()." into mnc-dev 2015-06-10 21:13:28 +00:00
Nick Kralevich
5ac4a5fa38 Merge "Fix USB access control when adb is disabled." into mnc-dev 2015-06-10 21:11:38 +00:00
Felipe Leme
a6dd714a5a Merge "Added new options (--eial, --elal, --efal, and --esal) to pass multiple extras as ArrayList instead of Array. BUG: 21757911 Change-Id: I7e2a9c81ad4606a8aba90ea4820ba0732a1c8749 modified: src/com/android/commands/am/Am.java On branch handles_array_list Changes to be committed: modified: src/com/android/commands/am/Am.java" into mnc-dev 2015-06-10 20:53:24 +00:00
Felipe Leme
f36a0f5d17 Added new options (--eial, --elal, --efal, and --esal) to pass multiple extras as ArrayList instead of Array.
BUG: 21757911
Change-Id: I7e2a9c81ad4606a8aba90ea4820ba0732a1c8749
	modified:   src/com/android/commands/am/Am.java
 On branch handles_array_list
 Changes to be committed:
	modified:   src/com/android/commands/am/Am.java
2015-06-10 13:44:04 -07:00
Dmitriy Ivanov
7cbe9f03a9 Merge "Fix abi-detection for 32-bit system apps" into mnc-dev 2015-06-10 20:39:33 +00:00
Adam Lesinski
3d53a26d1a Merge "Add more blaming output to batterystats dumpsys" into mnc-dev 2015-06-10 20:11:25 +00:00
Adam Lesinski
628ef9cbed Add more blaming output to batterystats dumpsys
Change-Id: I3216f13f16d89a72617d54638df43ce39183da9e
2015-06-10 13:08:57 -07:00
Jason Monk
253ee76dd9 Merge "Add action for reaching ignore battery optimizations" into mnc-dev 2015-06-10 20:06:15 +00:00
Jeff Brown
8e5d33ef98 Don't request traversals when updating display brightness.
Setting the display state and brightness does not require a surface
flinger transaction so don't schedule traversals unnecessarily.
They may still be scheduled as a side-effect of other operations
but only when needed.

Bug: 21296696
Change-Id: Ie264254ea1972c37319e5e5a06163d47f6689c22
2015-06-10 13:05:50 -07:00
Robin Lee
8bbbcd3d54 Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev 2015-06-10 19:44:18 +00:00
Robin Lee
83881bdbde Policy: make bulk CA uninstalls happen in service
Fewer round trips, only one point of contact for bugs to creep in.

Bug: 21650477
Change-Id: I1764faa753bd674ecb0d13149d778d99bd2ff4c4
2015-06-10 19:40:44 +00:00
Jason Monk
287b889f93 Add action for reaching ignore battery optimizations
Bug: 21375688
Change-Id: I1477192371aae2f3497fd49ad704de183ed836a3
2015-06-10 15:38:47 -04:00
Selim Cinek
94fc0c2630 Merge "Fixed a crash with HUN's" into mnc-dev 2015-06-10 19:22:53 +00:00
Jeff Brown
4bc5054040 Merge "Support 4K overlay displays." into mnc-dev 2015-06-10 19:21:13 +00:00
Wale Ogunwale
59d6d943d8 Merge "Revert "Revert "Recompute focus stack if cleared while starting an activity.""" into mnc-dev 2015-06-10 19:05:23 +00:00
Wale Ogunwale
6eeed830e3 Revert "Revert "Recompute focus stack if cleared while starting an activity.""
This reverts commit 47e53319509474c2f00847ac391dd32776712470.

Some how the reverted CL made it into mnc-dev and and master
when that was the intention...

Bug: 21751387
2015-06-10 12:03:23 -07:00
Abodunrinwa Toki
3ae8bf530a Merge "Change FloatingToolbar entry/exit animations to fadeIn/fadeOut." into mnc-dev 2015-06-10 19:02:17 +00:00
Santos Cordon
cefc16df98 Merge "TelephonyManager should use TelecomManager's getCallState()." into mnc-dev 2015-06-10 18:42:58 +00:00
Santos Cordon
8c332b7275 TelephonyManager should use TelecomManager's getCallState().
Telecom's version includes non-cellular calls in its result. Many apps
compile against TelephonyManager's existing API so we should update it
to use telecom instead.

We kept the implementation as cellular-only for
getCallState[ForSubscription](...) version of the API (which is hidden
anyway).

Bug: 21732997
Change-Id: Ifd27e6b49d76fe96ccc969e5262b1a876670aeef
2015-06-10 11:42:27 -07:00
Ben Kwa
c783a5e762 Merge "Enable apps to exclude their own roots from the DocumentsUI roots list." into mnc-dev 2015-06-10 18:30:31 +00:00
Ben Kwa
77797400ec Enable apps to exclude their own roots from the DocumentsUI roots list.
- Add DocumentsContract.EXTRA_EXCLUDE_SELF (boolean extra)
- Add code to DocumentsActivity to cache the providers of the calling
  app if EXTRA_EXCLUDE_SELF is set on incoming Intents.
- Add code to RootsCache to exclude roots from the calling app.
- Add code to allow only system apps to use EXTRA_PACKAGE_NAME.

Change-Id: Ia7cc2a1a297676c7b26f6e583042a4607d8c9a4e
2015-06-10 11:24:55 -07:00
Dan Sandler
37d1d6d0a3 Merge "Announce navbar buttons when lights-out." into mnc-dev 2015-06-10 18:20:56 +00:00
Dan Stoza
56b94e1593 Merge "screencap: Rotate images when display is rotated" into mnc-dev 2015-06-10 18:19:54 +00:00
Dan Sandler
e36280e325 Announce navbar buttons when lights-out.
Bug: 18821091
Change-Id: I03f749642aa1d080317f4cc57340e2ec931e9d56
2015-06-10 14:06:26 -04:00
John Reck
767ec84354 Merge "Set the right reportNextDraw" into mnc-dev 2015-06-10 18:05:03 +00:00
Dan Sandler
382225af47 Merge "Null check when reconstituting legacy icon data." into mnc-dev 2015-06-10 18:03:02 +00:00
Paul Jensen
c1e623bbca Merge "Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs" into mnc-dev 2015-06-10 17:59:54 +00:00
Chien-Yu Chen
a3a0ea3b1b Merge "Camera2: Clarify capture order for reprocess" into mnc-dev 2015-06-10 17:51:18 +00:00
Nick Kralevich
674019065b Fix USB access control when adb is disabled.
When adb is disabled, the default usb mode would be "none", which
would turn off the driver and prevent UsbDeviceManager from receiving
any new USB connect / disconnect messages. This prevents the user
from ever enabling MTP and sharing data when adb is turned off.

As discussed in bug 21429947, we work around this problem by keeping
the USB driver in MTP mode most of the time, so that we continue to
receive USB connect / disconnect messages.

To avoid leaking confidential user photos, this change introduces an
unlocked state. Setting the mtp enabled function is now decoupled from
exposing data on the USB connection. Only if MTP is enabled and
USB data has been unlocked is confidential user data allowed to be
shared.

Bug: 21429947
Change-Id: Iefb5c7e22dc4962bf5226f2ed3d0155b5c7b413c
2015-06-10 10:29:48 -07:00
John Reck
6fa9512e34 Set the right reportNextDraw
Bug: 8012229

mReportNextDraw is set by resized to have updateWindow() do
its thing. However if we are in updateWindow() and the
relayout() call to WindowManager wants us to report the draw
we should set reportNextDraw instead of mReportNextDraw
so that we report that frame instead of at the accidental next
invalidate.

Change-Id: If6c38d95599469831a0bd5e4d2b3f6c4f259e40c
2015-06-10 10:25:20 -07:00
John Spurlock
ef70f8e426 Merge "Volume: Show row headers for cast streams." into mnc-dev 2015-06-10 17:24:13 +00:00
Michael Wright
cc87cfa29c Merge "Fix order of initialization arguments for obtained MotionEvents." into mnc-dev 2015-06-10 17:06:16 +00:00
Clara Bayarri
89124000c6 Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 2015-06-10 16:50:46 +00:00
Jeff Sharkey
c7c8af6726 Merge "Send added user serial numbers to vold." into mnc-dev 2015-06-10 16:44:52 +00:00
Geoff Mendal
dc9ad9aaee Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 16:44:10 +00:00
Jeff Sharkey
bcd262da4b Send added user serial numbers to vold.
vold will eventually use the serial numbers to clean up stale user
directories when mounting private storage devices.

Bug: 20275572
Change-Id: I37f6c10026608dfa6484598420db5a5870330d25
2015-06-10 09:41:17 -07:00
Makoto Onuki
e6d8ffb40f Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 2015-06-10 16:38:55 +00:00
Geoff Mendal
43fbaf34c5 Import translations. DO NOT MERGE
Change-Id: I6645c53b1ec2f48524d162e7c9a771e0684e3628
Auto-generated-cl: translation import
2015-06-10 09:37:36 -07:00
James Cook
f22030d1c5 Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 2015-06-10 15:47:23 +00:00
Paul Lawrence
0c3aa4834e Merge "Remove hex encoding and password adjusting now that patterns are '1' based" into mnc-dev 2015-06-10 15:42:42 +00:00
Paul Jensen
67b0b0756b Avoid overlapping NetIDs in ConnectivityServiceTest with real NetIDs
Overlapping the NetIDs can cause the ConnectivityService instance under test
to inadvertently use real networks, for example when NetworkMonitor attempts
to validate a network.  This fixes test hangs when run on devices with
active internet connections.

Change-Id: I5e1898953f0117b9f75beccac4a52ae2db173567
2015-06-10 11:30:26 -04:00
Lorenzo Colitti
bc7b1a4ca2 Merge "When no Internet access is detected, display a notification first." into mnc-dev 2015-06-10 15:25:31 +00:00
Keisuke Kuroyanagi
136a462c8b Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 2015-06-10 15:13:16 +00:00
Keisuke Kuroyanagi
eac4556e55 Revert "Fix: Crash when modifying text while using drag accelerator."
This reverts commit 259292ff3de5b9a64e8e3bb4a62a533aef4125b7.

This introduced another bug (Bug: 21687602) and this is no longer useful
for the original one (Bug: 21178876).


Change-Id: I59acc161e7d8cba633718a3d17292e68740ef79e
2015-06-10 15:02:22 +00:00
Jason Monk
b73390acdd Merge "Fix work apps showing as not installed for owner" into mnc-dev 2015-06-10 14:58:56 +00:00
Lorenzo Colitti
f6673d07c3 When no Internet access is detected, display a notification first.
Previously, we displayed a dialog on top of whatever the user was
doing. Instead, display a notification that can take the user to
the dialog.

Because the notification is less intrusive, also enable it even
if the network without Internet access is already the system
default network. Previously we did not do this because in that
case the user might not have other useful options, and thus a
dialog would have been too intrusive.

Bug: 20081183
Bug: 20538448
Change-Id: I677be238d675c13a13dc0bae2dbb37cbe4f52cb6
2015-06-10 23:37:00 +09:00
Chet Haase
81728b862e Merge "Clarify docs for Animator.isStarted()" into mnc-dev 2015-06-10 14:27:47 +00:00
Paul Lawrence
05487618c1 Remove hex encoding and password adjusting now that patterns are '1' based
Bug: 21606650
Change-Id: Id2b01d43edcb995a9bffbc990e6297940e81f20e
2015-06-10 07:21:19 -07:00
Jason Monk
6ff98ce2c8 Fix work apps showing as not installed for owner
Bug: 21717956
Change-Id: Ia00537f3b50f958a2e35094abf1bfc73dc1f79af
2015-06-10 10:18:22 -04:00