OSDN Git Service
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
Allow debugging only for apps forked from zygote
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.
Bug:
23050463
(cherry picked from commit
7a09b8322cab26d6e3da1362d3c74964ae66b5d4)
Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
Adrian Roos [Tue, 21 Jul 2015 20:27:22 +0000 (13:27 -0700)]
Prevent insanely long passwords from crashing SystemUI
Bug:
22214934
Change-Id: I32e238e53ac4b6dd0ae6de226b98894c495b256f
Leon Scroggins III [Fri, 29 May 2015 20:13:11 +0000 (16:13 -0400)]
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
bug:
20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
Leon Scroggins III [Tue, 26 May 2015 20:41:09 +0000 (16:41 -0400)]
Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:
20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Wale Ogunwale [Thu, 11 Jun 2015 19:44:47 +0000 (12:44 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I11d0bc5301d7e2a64972221f54f3cbd611f8e404
(cherry picked from commit
44368567f840e3469b5fd2c9399ed444b6f46ebf)
Wale Ogunwale [Mon, 6 Apr 2015 23:08:52 +0000 (16:08 -0700)]
Lockdown AM.getRunningAppProcesses API with permission.REAL_GET_TASKS
* Applications must now have ...permission.REAL_GET_TASKS to
be able to get process information for all applications.
* Only the process information for the calling application will be
returned if the app doesn't have the permission.
* Privilages apps will temporarily be able to get process information
for all applications if they don't have the new permission, but have
deprecated ...permission.GET_TASKS.
Bug:
20034603
Change-Id: I67ae9491f65d2280adb6a81593693d499714a216
(cherry picked from commit
9dbaa54f6834e013a63f18bd51ace554de811d80)
Svet Ganov [Mon, 20 Apr 2015 15:28:30 +0000 (08:28 -0700)]
DO NOT MERGE Don't take flags when creating app widget config activity.
bug:
19618745
Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
Leon Scroggins III [Wed, 11 Mar 2015 17:12:06 +0000 (13:12 -0400)]
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
When reading from the parcel, if the number of colors is invalid, early
exit.
Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.
Also use an auto-deleter to handle deletion of the SkBitmap.
Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6
BUG=
19666945
Change-Id: Iab0d218c41ae0c39606e333e44cda078eef32291
John Reck [Wed, 13 May 2015 21:42:28 +0000 (21:42 +0000)]
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
This reverts commit
2614bd225f84f7a23e6b30fc6b47bede153e5f4c.
Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
John Reck [Thu, 19 Feb 2015 22:36:50 +0000 (14:36 -0800)]
DO NOT MERGE Backport of limited jank-tracking metrics
Bug:
19821830
Cherry-pick of
ba6adf66d3c44c0aa2fd8a224862ff1901d64300
Cherry-pick of
e70c5754d01f2ab0ff47ea3eabaa88aca5ed2a36
Change-Id: Id342fa0ab345f204bec58acf45ce72f6de950cfb
Wale Ogunwale [Thu, 2 Apr 2015 23:13:57 +0000 (16:13 -0700)]
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.
Bug:
19972099
Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9
Junichi Monma [Thu, 26 Mar 2015 13:54:21 +0000 (22:54 +0900)]
Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
bug id : b/
19938983
Change-Id: I7568bb9c41b90a57f2e3b89d3fa694ef692f05ac
Svetoslav [Thu, 29 Jan 2015 00:44:02 +0000 (16:44 -0800)]
AccessibilityNodeInfo refresh returns a stale state. - DO NOT MERGE
AccessibilityNodeInfo refresh was getting the latest cached
state but this is not good enough as an accessibility service
can execute an action on the node and then refresh it to get
the new state.
bug:
16954787
Change-Id: I004b4987b8dc423a2ab7031a4fbfe64365ddd7fe
(cherry picked from commit
5738fec00db65e0ee246475a7236e57ba3ee8d55)
Christopher Tate [Thu, 26 Mar 2015 22:38:29 +0000 (15:38 -0700)]
When scanning unbundled apps, only install the expected APK tree
We now make sure, when scanning post-factory app installs, that we do not
accidentally activate a "leaked" or otherwise superfluous APK tree that the
scan algorithm happens to encounter before the one that we expect a priori
based on the persisted package-installation state. When we find such an
extraneous installation we ignore it in favor of the expected one, similarly
to the policy used when collecting system-bundled packages that have been
updated.
Even if we find an unexpected APK for the package, if the expected one
turns out to be absent we fall back to the existing "we thought this app
was present and now it isn't" logic.
Bug
19602471
Change-Id: I141a93661946176c05d8cf52a123bdf75c8eef74
Jinsuk Kim [Tue, 24 Mar 2015 07:55:01 +0000 (16:55 +0900)]
CEC: Explicitly turn on screen for remote control passthrough
Ensures that the playback device turns on display output signal
upon receiving CEC command <User Control Pressed>.
Bug:
19518981
Change-Id: I4f898380c9ffc071da2357a51e61309ae5d233f5
(cherry picked from commit
9b8507c52ae845c8eed9fd9952bf66538934b8fd)
Paul Crowley [Wed, 25 Mar 2015 11:43:42 +0000 (11:43 +0000)]
Fix NPE if FPE service does not exist.
Bug:
19846662
Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576
Jeff Brown [Fri, 20 Mar 2015 01:26:30 +0000 (18:26 -0700)]
Disable more hotkeys while in setup.
Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.
Bug:
19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0
Andres Morales [Thu, 19 Mar 2015 15:34:55 +0000 (08:34 -0700)]
Write correct checksum when formatting partition
OEM unlock enabled bit is not computed in the checksum,
causing OEM Unlocking to be disabled after the second
reboot.
Bug:
19829441
Change-Id: I100bf5d3958b89323ee35b9e97b19c162209fcd7
Dong Zhou [Sun, 15 Mar 2015 16:59:49 +0000 (11:59 -0500)]
Define the capability to speed up MT call audio
Bug:
19656525
Change-Id: I0bc88e85b807871b2883a785efac91bd0e1f6d8d
Dan Sandler [Wed, 25 Feb 2015 18:20:39 +0000 (13:20 -0500)]
Avoid crashing on corrupted notifications.
If a notification content view has an @id/icon or
@id/right_icon, we need to make sure those ImageViews
actually have a drawable inside.
Bug:
19487078
Change-Id: I4ef6c4a10926823aa8680628097ed150d9e717d4
Michael Wright [Thu, 12 Mar 2015 23:23:05 +0000 (16:23 -0700)]
Prevent activities from being started during setup wizard.
Bug:
19677145
Change-Id: I1d7ca7b25077652355aa55848f973efa69d4b654
Roozbeh Pournader [Wed, 11 Feb 2015 23:45:49 +0000 (15:45 -0800)]
Move Noto Sans Tai Le to the end of the font fallback list.
This is to make sure the East Asian punctuation shared between CJK languages
and Tai Le are rendered from the CJK fonts when no language is specified
for the text, or CJK text is rendered in a non-CJK locale.
Also remove the old comment about 64k glyphs limit.
Bug:
19355391
Change-Id: Ic2cbc79cecf9539ace8a432f373685eeff81e106
(cherry picked from commit
70f0a4365bbffd016470807c9dbd7e9c1ea2df9d)
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug:
19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit
3d332f4e67a484abe597576bf329d89655afe720)
Dan Sandler [Mon, 2 Mar 2015 03:58:32 +0000 (22:58 -0500)]
Avoid crashing on startup when policy forbids lockscreen camera.
Bug:
19554426
Change-Id: I5b2898d7d114de87d925b5eccc8e4b189e4713de
The Android Automerger [Wed, 11 Mar 2015 00:12:49 +0000 (17:12 -0700)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Wed, 4 Mar 2015 23:18:42 +0000 (15:18 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Sanket Padawe [Tue, 24 Feb 2015 21:15:15 +0000 (13:15 -0800)]
Changing usage of carrier name field of SubInfoRecord
Bug:
19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
Jason Monk [Tue, 24 Feb 2015 13:55:26 +0000 (08:55 -0500)]
Keyguard: Use plmn/spn broadcast when no SIMs
The keyguard needs to show either 'emergency calls only' or 'no service'
depending on whether there is service available, so try to pull this from
the old sticky broadcast containing plmn/spn.
Bug:
19476978
Change-Id: I83523cc4c7dd5f46bd97df2cc9ecdb38d1c2e001
Adrian Roos [Thu, 19 Feb 2015 16:39:40 +0000 (17:39 +0100)]
Fix change IME content description
Bug:
19434845
Change-Id: I28be1d8efb61d47abdce168b07a0846056eb650d
Jim Miller [Wed, 25 Feb 2015 02:00:25 +0000 (18:00 -0800)]
Remove TrustAgent whitelisting API
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.
Bug
19461292
Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
Jim Miller [Thu, 19 Feb 2015 01:55:26 +0000 (17:55 -0800)]
Fix accessibility focus bug in statusbar
The notification_stack_scroller view of the new uber statusbar should
not be focusable for accessibility
Fixes bug
19296202
Change-Id: I1b3f43ee3c480c705044cb3d565c7c7f7019bcc3
Christopher Tate [Wed, 18 Feb 2015 01:04:01 +0000 (17:04 -0800)]
Fix wifi AP backup
An OutputStream buffers only by explicit contract. OutputStreamWriter
buffers internally, always. Do not get these behaviors confused.
Bug
19341967
Change-Id: I0610ed625b0175620083dd286f3a73c24956b171
Marco Nelissen [Tue, 17 Feb 2015 22:31:33 +0000 (14:31 -0800)]
Fix NPE
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.
Bug:
19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
Alan Viverette [Tue, 17 Feb 2015 21:09:04 +0000 (13:09 -0800)]
Fix year picker initial range
BUG:
19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
Craig Mautner [Tue, 17 Feb 2015 18:17:21 +0000 (10:17 -0800)]
Do not make ActivityContainer available to apps. DO NOT MERGE
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug
19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
Adrian Roos [Tue, 17 Feb 2015 19:46:01 +0000 (20:46 +0100)]
Revert "Fixed accessibility for the pin input view on keyguard."
Also removes the Klondike from the content description.
This reverts commit
c199ef37594b946cb295c29df321e74332ee5408
from change I3dd05fa1714da36795f448718fd70f1cdbfe2584
Bug:
18528774
Change-Id: I8a85076f939a8b78075b5a6322009ebfd78bf8d3
Adrian Roos [Tue, 17 Feb 2015 15:37:53 +0000 (16:37 +0100)]
Disable color view animations when stable insets change
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug:
19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
The Android Automerger [Fri, 13 Feb 2015 09:10:38 +0000 (01:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Svetoslav [Fri, 13 Feb 2015 01:54:15 +0000 (17:54 -0800)]
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
Ruben Brunk [Fri, 13 Feb 2015 01:22:24 +0000 (01:22 +0000)]
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
Luan Nguyen [Fri, 13 Feb 2015 00:16:48 +0000 (00:16 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
automerge:
fe2c687
* commit '
fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Fri, 13 Feb 2015 00:15:09 +0000 (00:15 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
automerge:
e0306bb
* commit '
e0306bbece4fd32d1e2f837dc515506180e04e8e':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Fri, 13 Feb 2015 00:13:35 +0000 (00:13 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
automerge:
946bf2d
* commit '
946bf2de30545a548022b8b8ba1b0ebc890ab08e':
docs: Fix notification api guide issues (
7461154,
12765600)
John Spurlock [Thu, 12 Feb 2015 22:52:12 +0000 (22:52 +0000)]
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 21:48:10 +0000 (21:48 +0000)]
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Ruben Brunk [Thu, 12 Feb 2015 20:16:44 +0000 (12:16 -0800)]
camera2: Fix legacy scaling factor application.
Bug:
19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
Luan Nguyen [Thu, 12 Feb 2015 19:13:47 +0000 (19:13 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:07:47 +0000 (19:07 +0000)]
am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:01:02 +0000 (19:01 +0000)]
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
Jeremy Joslin [Thu, 12 Feb 2015 18:34:01 +0000 (18:34 +0000)]
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
John Spurlock [Thu, 12 Feb 2015 18:29:37 +0000 (13:29 -0500)]
NoMan: Initialize filter value reported to listeners.
In addition to relying on change callbacks.
Bug:
19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
Luan Nguyen [Thu, 12 Feb 2015 17:35:43 +0000 (17:35 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
e726495a269b48f9b94fa9e545f84e79d587a282':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:35:38 +0000 (17:35 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
b6de0316a8f77b4425057eb4e75f7375c47fad65':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:17:04 +0000 (17:17 +0000)]
am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:16:59 +0000 (17:16 +0000)]
am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
e1f90b4e1e438c0086409ae0253a6452f2befbac':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:11:27 +0000 (17:11 +0000)]
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
Luan Nguyen [Thu, 12 Feb 2015 17:10:49 +0000 (17:10 +0000)]
Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
Benjamin Franz [Thu, 12 Feb 2015 16:12:58 +0000 (16:12 +0000)]
Fix the javadocs for lock task mode intents.
Bug:
19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
The Android Automerger [Thu, 12 Feb 2015 14:11:27 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Eino-Ville Talvala [Thu, 12 Feb 2015 05:33:27 +0000 (05:33 +0000)]
Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 03:51:05 +0000 (19:51 -0800)]
Fix accessibility focus bug in statusbar
The root view of the new uber statusbar should not be focusable.
Based on history, it looks like this was an oversight when this view
was refactored.
Fixes bug
19296202
Change-Id: Ib7f6908c30ab37384aa50f4fa4198c15593a96a4
Lorenzo Colitti [Thu, 12 Feb 2015 02:30:55 +0000 (02:30 +0000)]
Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
Jeremy Joslin [Thu, 12 Feb 2015 00:51:13 +0000 (16:51 -0800)]
Update Javadoc for EXTRA_NETWORK.
Bug:
19352840
Change-Id: Ib668bee0fb2c6f5bcd01a7908ebd20b9ec8a40ef
Adam Powell [Thu, 12 Feb 2015 02:08:03 +0000 (02:08 +0000)]
Merge "Add DENSITY_280" into lmp-mr1-dev
Eino-Ville Talvala [Wed, 11 Feb 2015 23:41:12 +0000 (15:41 -0800)]
Legacy: Only set user surface dimensions on output surfaces
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.
Bug:
16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
Adam Powell [Wed, 11 Feb 2015 21:34:43 +0000 (13:34 -0800)]
Add DENSITY_280
Bug
19350604
Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
Luan Nguyen [Tue, 10 Feb 2015 21:10:39 +0000 (13:10 -0800)]
docs: Fix issue with onCreate() method declaration in file backup section
bug:
3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
Luan Nguyen [Mon, 2 Feb 2015 20:17:40 +0000 (12:17 -0800)]
docs: Update device art generator to include Wear generic devices.
bug:
14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
Michael Wright [Wed, 11 Feb 2015 18:23:54 +0000 (18:23 +0000)]
Merge "Stop active media projections on user switch." into lmp-mr1-dev
The Android Automerger [Wed, 11 Feb 2015 14:11:17 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Jeff Davidson [Wed, 11 Feb 2015 08:25:26 +0000 (08:25 +0000)]
Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev
Jeff Davidson [Tue, 10 Feb 2015 18:02:11 +0000 (10:02 -0800)]
Do not enforce CONTROL_VPN for calls from lockdown VPN.
Clearly document which methods in Vpn.java are designed to be used to
service a Binder call, and which must therefore check permissions and
clear the calling identity, and which methods are designed for
internal use only and which therefore need not check permission.
Add a new startLegacyVpnPrivileged method which bypasses the
permission checks, to be used by lockdown VPN which is a trusted
system service. Ensure that the existing startLegacyVpn method checks
permissions as this is used whenever we respond to a binder call.
Bug:
19311172
Change-Id: I34f13258ee7481f1356bc523124cf5db068b4972
Lorenzo Colitti [Wed, 11 Feb 2015 07:18:16 +0000 (07:18 +0000)]
Merge "Make getNetworkInfo() take into account VPN underlying networks." into lmp-mr1-dev
Shishir Agrawal [Wed, 11 Feb 2015 03:02:38 +0000 (19:02 -0800)]
GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug:
18814559
Change-Id: I0333050d2a5b8d484466e1b1914dcfb9965398c9
Lorenzo Colitti [Tue, 10 Feb 2015 22:39:20 +0000 (07:39 +0900)]
Make reportInetCondition revalidate if the report differs from our state
1. If reportInetCondition says the network is not working, and
the network is already marked not validated, don't revalidate
it. This was superfluous and should save battery.
2. If reportInetCondition says the network is working, and the
network is not marked as validated, revalidated. This will
allow us to get out of a validated state quickly based on app
input (e.g., allowing GCM's exponential backoff timer to drive
revalidation instead of our 10-minute timer).
Bug:
19258761
Bug:
19209043
Change-Id: Iaa4bac82d117ed1f4088dab106e6f6ce46b34bc3
Lorenzo Colitti [Thu, 5 Feb 2015 04:57:17 +0000 (13:57 +0900)]
Make getNetworkInfo() take into account VPN underlying networks.
If a user is subject to a VPN, getActiveNetworkInfo() will return
the VPN's underlying network (e.g., TYPE_WIFI), so that apps that
call getActiveNetworkInfo to answer questions like "is the device
connected to wifi?" will continue to work. Make getNetworkInfo
do this as well: if the query is for a network type that is
underlying the current user's VPN, then return that network.
Bug:
19196545
Change-Id: Ic5a651735b927c758594a26d26a03fbd704b52e6
Leon Scroggins III [Tue, 10 Feb 2015 22:03:43 +0000 (22:03 +0000)]
Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev
Leon Scroggins III [Mon, 9 Feb 2015 20:42:19 +0000 (15:42 -0500)]
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
BUG:
19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
Shanea King-Roberson [Tue, 10 Feb 2015 20:17:53 +0000 (20:17 +0000)]
am
24513bc5: am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
24513bc580024a8a90c1ceab6746c0abb452d678':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 20:10:38 +0000 (20:10 +0000)]
am
31622894: am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
3162289445ebade804c422162578d328c4762372':
Adding videos for 5.0 changes and watch face development.
Luan Nguyen [Tue, 3 Feb 2015 17:58:34 +0000 (09:58 -0800)]
docs: Fix notification api guide issues (
7461154,
12765600)
bug:
7461154
bug:
12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
Shanea King-Roberson [Tue, 10 Feb 2015 20:04:17 +0000 (20:04 +0000)]
am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 19:57:29 +0000 (19:57 +0000)]
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
Chris Warrington [Tue, 10 Feb 2015 19:56:31 +0000 (19:56 +0000)]
Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
Luan Nguyen [Tue, 10 Feb 2015 18:56:32 +0000 (18:56 +0000)]
am
ba795593: am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
ba795593e5941d89a861bb848c3f98800a0be3d6':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:47:38 +0000 (18:47 +0000)]
am
9b432bbe: am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
9b432bbece3cca6316b2638a947983e21c65917f':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:40:34 +0000 (18:40 +0000)]
am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
e49fbfa21ccdeba56001b48604524794acea119e':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:31:29 +0000 (18:31 +0000)]
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
Eric Gilmore [Tue, 10 Feb 2015 18:29:36 +0000 (10:29 -0800)]
Adding videos for 5.0 changes and watch face development.
On branch pilot-videos
Changes to be committed:
modified: docs/html/about/versions/android-5.0-changes.jd
modified: docs/html/training/wearables/watch-faces/index.jd
Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
Eric Gilmore [Tue, 10 Feb 2015 18:05:23 +0000 (18:05 +0000)]
am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
automerge:
2b36779
* commit '
2b36779f30a511cc4439a519c95963280a779fdc':
Doc change: refactor GCM docs to be platform-agnostic.
Eric Gilmore [Tue, 10 Feb 2015 17:56:51 +0000 (17:56 +0000)]
am
99b91b2f: am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
* commit '
99b91b2fd28888b20511316cb6f81b510b05cdf5':
Doc change: refactor GCM docs to be platform-agnostic.
Eric Gilmore [Tue, 10 Feb 2015 17:45:47 +0000 (17:45 +0000)]
am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
* commit '
c9dbaf0483b0274879164806297180d260689f1f':
Doc change: refactor GCM docs to be platform-agnostic.
Luan Nguyen [Wed, 28 Jan 2015 17:30:28 +0000 (09:30 -0800)]
docs: Fix various issues with incorrect code samples.
bug:
15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
John Spurlock [Tue, 10 Feb 2015 14:10:21 +0000 (09:10 -0500)]
Doze: pulse less often.
Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.
Bug:
19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b
The Android Automerger [Tue, 10 Feb 2015 14:11:46 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Chris Warrington [Tue, 10 Feb 2015 05:04:46 +0000 (21:04 -0800)]
Fix AAPT daemon mode with paths containg spaces.
Use new line as a delimiter rather than space.
Fixes: https://code.google.com/p/android/issues/detail?id=135757
Gradle CL: https://android-review.googlesource.com/130423
Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
Svetoslav [Tue, 10 Feb 2015 01:14:28 +0000 (17:14 -0800)]
Accessibiltiy: missed update to the previous patch.
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
Eric Gilmore [Tue, 10 Feb 2015 01:13:01 +0000 (01:13 +0000)]
Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
Baligh Uddin [Tue, 10 Feb 2015 00:57:19 +0000 (00:57 +0000)]
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev