194285 Commits

Author SHA1 Message Date
Yoshiki Iguchi
00d5122b2b Add a permission annotation to IMM#setCurrentInputMethodSubtype.
Bug: 19477686
Change-Id: I97cb9b57fd0182ee479f4e7dea34801d7b168b9f
2015-06-02 08:52:49 +00:00
Nitin Shivpure
1f8b844870 Bluetooth: Fix to avoid framework reboot during monkey testing
When running monkeyrunner, sometimes the framework is disconnected due
to an unhandled Java exception while binding the PAN service (when it
is unsuccessful). Handing the Java exception while binding PAN service
solves this issue.

Change-Id: Idea710593a3f9496305f636042605303e73e7749
2015-06-02 01:23:11 -07:00
The Android Automerger
7220c18809 merge in mnc-release history after reset to mnc-dev 2015-06-02 01:02:11 -07:00
Seigo Nonaka
ac1f0a1a91 Merge "Hide the software input based on its state." into mnc-dev 2015-06-02 07:55:49 +00:00
Lorenzo Colitti
8f602cdd38 Merge "Fix DHCP lease time parsing." into mnc-dev 2015-06-02 07:47:48 +00:00
Erik Kline
168bfef182 Merge "pass a defensive copy of DhcpResults" into mnc-dev 2015-06-02 07:42:54 +00:00
Erik Kline
d59aa84fda pass a defensive copy of DhcpResults
Also: correct state transition handling in DhcpBoundState#enter().

Bug: 20451261
Change-Id: I3be50f6b1b3fae179d6fff7ca8ae1d687caa3221
2015-06-02 16:22:57 +09:00
Lorenzo Colitti
d973537ee1 Fix DHCP lease time parsing.
Currently we treat a lease time larger than 2**31-1 as a negative
value, which causes DhcpClient to attempt to renew its IP address
constantly. Fix this by properly handling large and infinite
lifetimes, and while we're at it, impose a minimum lease time of
60 seconds.

Bug: 21352084
Change-Id: If62c9efeffad6222e2fe0c110f77d0e4c70de96d
2015-06-02 16:21:17 +09:00
David Friedman
7ceea5145b Docs: Fixes several typos on Android Studio index.html page.
Change-Id: I255ae6ea19fe230dc4c4b859a8d735f3fdd8efca
2015-06-01 22:48:54 -07:00
Jeff Brown
417820bb60 am 65f6996a: (-s ours) am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE
* commit '65f6996add7fe38000b5e28675b70064cec31837':
  Terminate loop properly when cursor window is full. DO NOT MERGE
2015-06-02 03:45:27 +00:00
Jeff Brown
65f6996add am eb4bd19e: Terminate loop properly when cursor window is full. DO NOT MERGE
* commit 'eb4bd19ef09b2c277347b08c4a050f01f686c9c2':
  Terminate loop properly when cursor window is full. DO NOT MERGE
2015-06-02 03:33:31 +00:00
dooyoung.hwang
328472ebd8 Patches for IKeyguardStateCallback
1. Also notify input is restricted or not when IKeyguardStateCallback callback is added.
When first Keyguard is showing after boot, the mInputRestricted is not updated. So,
inKeyguardRestrictedInputMode still returns false, although device is locked.

2. If mShowing remains false during setup time of KeyguardViewMediator, mInputRestricted
is not updated. This is because updateInputRestrictedLocked is called only if showing
value is changed during setup time.
For this reason, when device is not provisioned, inKeyguardRestrictedInputMode returns
false, and device does not restrict key.

3. If one of callbacks causes RemoteException, the other callbacks are not called.
This is because catching RemoteException breaks for-loop.

(cherry-picked from commit 516dad062580201d7a4ad6c112b23434385d5268)

Change-Id: I0281405127bcc75285b908d01485da3ac9b40b52
Signed-off-by: Dooyoung Hwang <dooyoung.hwang@lge.com>
2015-06-02 03:01:20 +00:00
Adrian Roos
5892248580 aapt: add option for stricter symbol generation
Adds an option that prevents generating java symbols for string
resources that don't have a default localization.

Bug: 21537397
Change-Id: Ifafa942b24d5cdbed93651cde363e859be13d395
2015-06-02 02:55:52 +00:00
Andre Eisenbach
708f57f4dc Un-hide connectGatt() variant with selective transport
Change-Id: I1d3c512160de2bd68550faf243bb151d5cf7f3c9
2015-06-02 02:28:54 +00:00
Ruben Brunk
11df5b66ef Merge "Track camera and flashlight usage in battery stats." into mnc-dev 2015-06-02 01:48:27 +00:00
Seigo Nonaka
d9eb911bb9 Hide the software input based on its state.
This is a 2nd trial of I20ae2749a which is reverted due to a regression.
The goals of this CL are two:
- Split setImeWindowStatus method into two: keeping IMS status and
  updating system UI e.g. NavBar icon state.
- Hide software keyboard based on a realistic IMS status.

IMMS#mImeWindowVis has been used for two purpose, keeping IMS status and
updating the NavBar icons, e.g. keyboard icon.
However, to update NavBar icon, sometimes IMMS#mImeWindowVis value is
updated without any notification from IMS. As the result, the status
value becomes incosistent with the real IMS state.
This patch extracts NavBar update logic into separate method and keeps
IMMS#mImeWindowVis as notified status. Then, use it for hiding software
input correctly in IMMS#hideCurrentInputLocked.

This CL also removes refreshImeWindowVisibilityLocked method including
workaround for fixing Bug 11186297. That issue is no longer
reproducible with latest lock screen and almost no effect for existing
users and developers.  So simply remove them in this CL.

BUG: 21446788
BUG: 20764441
BUG: 18722991
Change-Id: I33dc6278fd892f26e56352722bf9449b8b102030
2015-06-02 10:32:48 +09:00
Quddus Chong
082138cd1c am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922
* commit '348d0a68ad317877061f23da512144b0e4c2dc7c':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922
2015-06-02 01:25:21 +00:00
Dmitriy Ivanov
95b7d50ce1 Print exception stacktrace on failed scanPackageLI
The current message does not provide enough
 information to figure out what is going on.

Bug: http://b/8076853
Change-Id: I741781ce6829eac44e4edddd0a545f3be743ceeb
2015-06-01 18:23:29 -07:00
Sanket Padawe
405e895c98 Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev 2015-06-02 01:20:26 +00:00
Clara Bayarri
a0b77dd5e2 Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev 2015-06-02 01:15:50 +00:00
Clara Bayarri
d63a177670 Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev 2015-06-02 01:15:03 +00:00
Quddus Chong
348d0a68ad am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922
* commit '7af3566912b0e014cfd1704acdeb31a0a7cca0d3':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922
2015-06-02 01:07:57 +00:00
Jorim Jaggi
d944986fbd Fix API review: Camera prewarm
Let the intent receiver of a camea launch intent declare a prewarm
service instead of sending broadcasts.

Bug: 21347653
Change-Id: I11e31aad4f788ad90eb46a661b819d3e808ddb51
2015-06-01 18:01:20 -07:00
Adam Powell
fa3f17f117 Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev 2015-06-02 01:00:06 +00:00
Doris Liu
06d582d4e4 Fix calls to Rect.intersect(Rect) in package com.android.server.wm
This CL checks for the return value for Rect.intersect(Rect) for whether
there is actually an intersection before taking the calling rect as the
intersection. In addtion, this CL handles the cases where there is no
intersection (Rect.intersect(Rect) returns false).

bug: 7368679
Change-Id: I7d5ef7059ac432170470a108c0d6dece230ec0b3
2015-06-01 17:34:20 -07:00
Svetoslav
4982e7b4dc Merge "Don't add real children for a view with a node provider" into mnc-dev 2015-06-02 00:22:39 +00:00
Svetoslav
762621ced7 Don't add real children for a view with a node provider
Change-Id: I1dd43fa5ff93e8eb76e2c7587fb13cd1ef097678
2015-06-01 17:21:59 -07:00
Quddus Chong
7af3566912 docs: Added Javadocs for Testing Support Library v0.3 and updated
the corresponding setup instructions.
bug: 21442922

Change-Id: I7374e8102fc95377e83db738ab7ff20510e04faa
2015-06-01 17:18:39 -07:00
Amit Mahajan
3ed641f65c Change to hide BEARER_BITMASK.
BEARER_BITMASK uses ServiceState constants that are not public so
keeping it hidden for now. Ideally it should use TelephonyManager
constants instead as they are already public. However the constant
values for same RATs are different between the two. So mapping from
one to the other is as apns xml files will also need to be updated
(including those of OEMs).

Bug: 21342148
Change-Id: Iced28ede187d3e72b3f969bc99af4edf34d86a36
2015-06-01 17:12:14 -07:00
Chris Craik
17498cd944 Rework systrace analysis documentation
Also update some of the out-of-date aspects of the systrace help page.

Change-Id: I869f6d481ecc2835ea8713bb46f6e5d550abea98
2015-06-01 17:11:46 -07:00
Jeff Brown
eb4bd19ef0 Terminate loop properly when cursor window is full. DO NOT MERGE
The existing code exits the column-filling loop immediately but
may continue to try to fill rows.  Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later.  Fixed this problem by exiting the row-
filling loop promptly.

Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
(cherry picked from commit bb8c841e909a2fb967db2ad3b9f8b058f9b849e8)
2015-06-02 00:00:34 +00:00
Jorim Jaggi
03a7c4c6d4 Fix shared drawable state
Not calling mutate here had a side-effect making the icon in the
status bar untintable in SysUI.

Bug: 21566007
Change-Id: Ifb78c81ba7f04d496f14031ef635a6e964e6280e
2015-06-01 23:59:00 +00:00
Ruben Brunk
6d2c363fd5 Track camera and flashlight usage in battery stats.
Bug: 15986092

Change-Id: Idf03981271721c44fd43327d5d90cf6f3fecfacb
2015-06-01 16:54:23 -07:00
Svetoslav
acbe426bbc Merge "Add accidentally deleted strings." into mnc-dev 2015-06-01 23:53:55 +00:00
Selim Gurun
8a6d511dad Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev 2015-06-01 23:53:11 +00:00
Alan Viverette
b0f94ae5d2 Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev 2015-06-01 23:52:36 +00:00
Svetoslav
5f79d8282d Add accidentally deleted strings.
Change-Id: I16d7c151b46c076bfdccb1ff0b2bcb0934eedf93
2015-06-01 16:51:11 -07:00
Eino-Ville Talvala
717a2d09fa Merge "Camera2: Remove isLoggable" into mnc-dev 2015-06-01 23:47:32 +00:00
Alan Viverette
376c32f268 Always send VIEW_CLICKED event from AdapterView.performItemClick()
This makes it consistent with View.performClick().

Bug: 19574976
Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d
2015-06-01 16:41:42 -07:00
Selim Gurun
50b26a5c27 Remove ViewAssistStructure and use the frameworks data structure
As part of the API rename from ViewAssistStructure to ViewStructure,
we added a temporary workaround to prevent build breakage. Remove
the temporary workaround since the current unbundled webview package
implements the updated  onProvideVirtualStructure API.

Change-Id: I13a5b8dee3e856eb585de53a0750bd52c7a909a7
2015-06-01 23:41:12 +00:00
Jeff Brown
0505f7f2b5 Merge "Terminate loop properly when cursor window is full." into mnc-dev 2015-06-01 23:34:25 +00:00
Jeff Brown
57bf3d9c2d Add missing docs to StateSet.
Bug: 3370250
Change-Id: Ib69b69873cf8f583734d5305b5a0d73e9d97dee9
2015-06-01 16:33:30 -07:00
Jeff Brown
bb8c841e90 Terminate loop properly when cursor window is full.
The existing code exits the column-filling loop immediately but
may continue to try to fill rows.  Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later.  Fixed this problem by exiting the row-
filling loop promptly.

Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
2015-06-01 16:33:24 -07:00
Adrian Roos
c45d6c30a5 Merge "Translucent bars in landscape" into mnc-dev 2015-06-01 23:25:35 +00:00
Deepanshu Gupta
346222f90a Merge "LayoutLib: Skip classes from java package." into mnc-dev 2015-06-01 23:20:12 +00:00
Deepanshu Gupta
7ef93d1573 Merge "Skip warnings for some unresolved references." into mnc-dev 2015-06-01 23:20:04 +00:00
Filip Gruszczynski
b7de0e5467 More inclusive rules for using outsets.
Just fullscreen windows is not enough for existing uses. We also need to
preserve chin functionality for overscan windows and wallpapers.

Change-Id: I0266d126244102e04bb29aa08e122b3c68d88383
2015-06-01 16:18:51 -07:00
Quddus Chong
133b107d28 am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273
* commit '65b7485d64661394b61df3df7eeccd063932886e':
  docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273
2015-06-01 23:11:47 +00:00
Winson Chung
c85cd734bd Merge "Don't focus view for invalid task index." into mnc-dev 2015-06-01 23:07:37 +00:00
Winson Chung
daa4a78682 Don't focus view for invalid task index.
Bug: 21322861
Change-Id: I7b8397d18b488bd8f459e578b64d6e82e4f1437d
2015-06-01 16:02:58 -07:00