OSDN Git Service
Eino-Ville Talvala [Tue, 25 Mar 2014 18:57:08 +0000 (18:57 +0000)]
Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
Craig Mautner [Tue, 25 Mar 2014 17:48:38 +0000 (17:48 +0000)]
am
550b44d1: am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
550b44d1884c5f65187dbc8bf8d4e6090f302a7b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:42:38 +0000 (10:42 -0700)]
am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
f4644189f665f221e8033587811e58f12e2ccc86':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:36:04 +0000 (10:36 -0700)]
am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:29:48 +0000 (10:29 -0700)]
am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
02c7ba73e8733def289535b6d13dc6a504a0443f':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:22:56 +0000 (10:22 -0700)]
am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
41bb0637ca430808ab40a0300467ea58ae0a05c3':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 17:22:55 +0000 (17:22 +0000)]
Merge "Don't wait for finishing animation when second display is disconnected" into klp-dev
Koji Fukui [Fri, 14 Mar 2014 12:20:21 +0000 (21:20 +0900)]
Don't wait for finishing animation when second display is disconnected
Basically WindowManagerService wait for finishing animation when
a window is removed. But when second display is disconnected, windows
on second display can't be shown even if animation is waited for.
On the contrary, it keeps on waiting for finishing the animation
in special case.
With this fix windows are immediately removed without waiting for
animation when second display is disconnected.
(Cherry picked from aosp
39f7068ed903f747d6885117dc1bac69f626ae91)
Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e
Fixes bug: b/
13632129
Craig Mautner [Tue, 25 Mar 2014 17:04:07 +0000 (10:04 -0700)]
am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
76e85eec845ff3688e6fd5b7bafbb5934530df4b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:58:17 +0000 (09:58 -0700)]
am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
3bc9971d707839f2d26e601082d654242295002d':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:52:28 +0000 (09:52 -0700)]
am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
95d6e32bc3c5382740a6bb418f77cf7147d833f7':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Craig Mautner [Tue, 25 Mar 2014 16:48:38 +0000 (16:48 +0000)]
Merge "Move task to top in window manager." into klp-dev
Craig Mautner [Tue, 25 Mar 2014 16:48:27 +0000 (09:48 -0700)]
am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
86f9a93e20bf33b9f5152592f4781bd253be8643':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Baligh Uddin [Tue, 25 Mar 2014 16:47:23 +0000 (16:47 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Craig Mautner [Tue, 25 Mar 2014 16:43:40 +0000 (16:43 +0000)]
Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
Matthew Williams [Mon, 24 Mar 2014 21:42:06 +0000 (14:42 -0700)]
DO NOT MERGE: Downgrade expedited to normal on reschedule.
bug:
12033540
Expedited was previously tracked by a redundant internal variable, ostensibly
as an optimisation. This variable could differ from the value in the bundle
depending on how the operation is initialised, which led to confusion. Now an
expedited sync will only be treated as such on its first execution.
Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6
Baligh Uddin [Mon, 24 Mar 2014 16:46:08 +0000 (09:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0b32878886c66eb9fdd22bf332786e140d334533
Auto-generated-cl: translation import
Selim Cinek [Mon, 24 Mar 2014 12:53:06 +0000 (13:53 +0100)]
Fixed wallpaper bug where wrong size was taken when cropping
When cropping, the selected area of the image was incorrectly
cropped to the size of the view instead of the size of the image
Bug:
13617446
Change-Id: If54a0891fa2cdeee70ba63752874f1543d401701
Craig Mautner [Thu, 20 Mar 2014 02:48:38 +0000 (19:48 -0700)]
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Previous fix to keep non-show-when-locked windows hid dialogs from
activities that had asked to be show-when-locked. That was too
restrictive.
Fixes bug
13225149.
Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
The first set of these APIs is for telephony:
Added some APIs to ITelephony and created a first party framework for them
toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)
Bug:
13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6
Igor Murashkin [Wed, 19 Mar 2014 01:14:41 +0000 (18:14 -0700)]
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Bug:
12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
Selim Cinek [Fri, 21 Mar 2014 18:19:08 +0000 (19:19 +0100)]
Disable Set Wallpaper button while loading image
Bug:
13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit
0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
Chad Brubaker [Fri, 21 Mar 2014 20:52:14 +0000 (20:52 +0000)]
Merge "Fix support for simultaneous VPN tuns" into klp-dev
Chad Brubaker [Fri, 21 Mar 2014 20:52:04 +0000 (20:52 +0000)]
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
John Reck [Fri, 21 Mar 2014 19:37:27 +0000 (19:37 +0000)]
Merge "Eliminate mHasAlpha" into klp-dev
Unsuk Jung [Fri, 21 Mar 2014 19:01:08 +0000 (19:01 +0000)]
Merge "Change wallpaper sizing" into klp-dev
John Reck [Fri, 21 Mar 2014 18:09:45 +0000 (11:09 -0700)]
Eliminate mHasAlpha
Bug:
13580771
The cached value mHasAlpha on Bitmap could get out of sync with the
real value stored in the SkBitmap. Fix this by just eliminating the
cached value. This adds an extra JNI call in copy(), createBitmap(),
and setPremultiplied(), none of which are going to be significantly
impacted by the extra JNI call.
Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
Jeff Sharkey [Fri, 21 Mar 2014 17:47:00 +0000 (17:47 +0000)]
Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
Michael Jurka [Wed, 18 Dec 2013 16:10:16 +0000 (17:10 +0100)]
Change wallpaper sizing
Bug:
11997581
- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary
Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit
824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
Mike Lockwood [Fri, 21 Mar 2014 01:06:16 +0000 (01:06 +0000)]
Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
Mike Lockwood [Fri, 21 Mar 2014 01:05:56 +0000 (01:05 +0000)]
Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
Wei Wang [Fri, 21 Mar 2014 00:37:33 +0000 (00:37 +0000)]
Merge "Fix stopBatchedScan not working for wifi" into klp-dev
Adam Powell [Fri, 21 Mar 2014 00:19:11 +0000 (00:19 +0000)]
Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
Wei Wang [Thu, 20 Mar 2014 23:27:01 +0000 (16:27 -0700)]
Fix stopBatchedScan not working for wifi
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
Marco Nelissen [Thu, 20 Mar 2014 20:36:34 +0000 (20:36 +0000)]
am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:22:34 +0000 (13:22 -0700)]
am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:16:32 +0000 (13:16 -0700)]
am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
759445c5bdb2eb54af9e974f604226596976e078':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 19:51:55 +0000 (12:51 -0700)]
resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
Mike Lockwood [Thu, 20 Mar 2014 18:14:08 +0000 (11:14 -0700)]
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received. However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode. To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received. Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.
Bug:
13393825
Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
Mike Lockwood [Wed, 19 Mar 2014 23:56:18 +0000 (16:56 -0700)]
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
This reverts commit
fbd5521fb5e94fad066e21b9f91f4782afe71660.
This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start". So we revert this change and will replace it with a better fix.
Bug:
13535051
Bug:
13393825
Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
Vinit Deshapnde [Thu, 20 Mar 2014 19:26:44 +0000 (19:26 +0000)]
Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
Baligh Uddin [Thu, 20 Mar 2014 18:32:35 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Marco Nelissen [Thu, 20 Mar 2014 18:11:16 +0000 (11:11 -0700)]
am
072e1da2: am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
072e1da26e80adb4009d063428c2ef8fb65c3d6c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 18:06:41 +0000 (11:06 -0700)]
am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
b17cf207372268d91177de7efa692b2483785991':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:54:38 +0000 (10:54 -0700)]
am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
9ee72b65436242ab4f8f4ceb904ea5078779416c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:51:35 +0000 (10:51 -0700)]
am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
665b07579aa2a74bb5425d543892da40d78b7ef8':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:47:34 +0000 (10:47 -0700)]
am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
81fbdade8db4117157ea48602be121e6cf5597dd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:27:58 +0000 (10:27 -0700)]
resolved conflicts for merge of
534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
Craig Mautner [Thu, 20 Mar 2014 17:08:04 +0000 (10:08 -0700)]
Move task to top in window manager.
In certain situations it was possible for a task to move to the top
in activity manager but not in window manager. This resulted in
the task appearing behind the launcher icons.
Fixes bug
13410184.
Change-Id: If0582b395e126a8aff70a0e4c64b731083c6ae8a
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am
a3337bc7: Merge "Verify certificates" into jb-dev
* commit '
a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev
Adam Powell [Thu, 20 Mar 2014 00:35:25 +0000 (17:35 -0700)]
Update contextual asset bar assets to avoid 9-patch artifacts
Asset drop from UX
Bug
11879853
Change-Id: I8190340900a16ae41135ec1231e36e959603e165
Wei Wang [Wed, 19 Mar 2014 22:47:12 +0000 (15:47 -0700)]
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050
Cherrypick from master to fix b/
13289050
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
Wei Wang [Thu, 20 Mar 2014 03:27:46 +0000 (03:27 +0000)]
Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
Jim Miller [Tue, 10 Dec 2013 01:38:05 +0000 (17:38 -0800)]
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().
It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.
The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.
Fixes bug
11982048
Change-Id: I6959816b819ba953512c53675162195cbf1e0653
Jim Miller [Thu, 20 Mar 2014 01:37:36 +0000 (18:37 -0700)]
Fix the build. DO NOT MERGE
Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
Chris Craik [Thu, 20 Mar 2014 01:04:57 +0000 (01:04 +0000)]
Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
Jim Miller [Thu, 20 Mar 2014 01:04:12 +0000 (01:04 +0000)]
Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
Wei Wang [Wed, 12 Mar 2014 05:22:41 +0000 (22:22 -0700)]
DO NOT MERGE: Add status callback for start/stop advertising.
Cherrypick from master to fix b/
13289050
Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
Victoria Lease [Wed, 19 Mar 2014 22:27:06 +0000 (22:27 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:21:09 +0000 (15:21 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:14:07 +0000 (15:14 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:08:32 +0000 (15:08 -0700)]
Vinit Deshapnde [Wed, 19 Mar 2014 22:04:49 +0000 (15:04 -0700)]
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
This helps in reducing overt scans when cell network is unavailable; and
in turn helps alleviate some regulatory concerns.
BUG:
11062898
Change-Id: I2d860f2d1acfdafba427504247a54b81482b0f5b
Victoria Lease [Wed, 19 Mar 2014 22:03:28 +0000 (15:03 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:57:36 +0000 (14:57 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:51:58 +0000 (14:51 -0700)]
Victoria Lease [Wed, 19 Mar 2014 21:47:23 +0000 (14:47 -0700)]
am
31912122: am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
3191212259b1629cf8174416adf01522b88501ad':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:40:17 +0000 (14:40 -0700)]
am
6eb28103: am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
6eb2810318262ff36014c52384ed3cdea19bd34e':
malloc some advances
Craig Mautner [Wed, 19 Mar 2014 21:37:07 +0000 (21:37 +0000)]
Merge "Fix loop limits." into klp-dev
Victoria Lease [Wed, 19 Mar 2014 21:32:15 +0000 (14:32 -0700)]
am
183f97b7: am
1c12f9e7: malloc some advances
* commit '
183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
malloc some advances
Victoria Lease [Wed, 19 Mar 2014 21:27:19 +0000 (14:27 -0700)]
am
1c12f9e7: malloc some advances
* commit '
1c12f9e76298c757423155ad812890d27effafe8':
malloc some advances
Craig Mautner [Thu, 19 Dec 2013 00:43:51 +0000 (16:43 -0800)]
Fix loop limits.
Fixes bug
12207606.
Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
Lajos Molnar [Wed, 19 Mar 2014 20:43:22 +0000 (20:43 +0000)]
Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev
Adam Cohen [Wed, 19 Mar 2014 20:16:10 +0000 (20:16 +0000)]
Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev
Adam Cohen [Wed, 19 Mar 2014 20:15:41 +0000 (20:15 +0000)]
Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev
Chris Craik [Wed, 29 Jan 2014 21:00:33 +0000 (13:00 -0800)]
Fix projection offset caching - DO NOT MERGE
bug:
13214038
Because the caching of projection matrix didn't account for changes in
the offset flag, the flag could be ignored. Now we use both to verify
that the cached matrix can be used.
Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd
(cherry picked from commit
d04a6b15f74035fd2068f34225825b55e94521f4)
Jeff Brown [Wed, 19 Mar 2014 20:01:42 +0000 (20:01 +0000)]
Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
Lajos Molnar [Tue, 11 Mar 2014 00:21:49 +0000 (17:21 -0700)]
MediaPlayer: fix int overflow issue in MediaTimeProvider
Bug:
13394783
Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584
Michael Jurka [Tue, 14 Jan 2014 13:48:20 +0000 (14:48 +0100)]
[DO NOT MERGE] Centering the crop by default in system wallpaper cropper
Bug:
12034934
Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
(cherry picked from commit
2ab14daebac46307d2364733481edc3115bbf98c)
Michael Jurka [Mon, 2 Dec 2013 23:05:44 +0000 (15:05 -0800)]
[DO NOT MERGE] Fix wallpaper cropping bugs
- take into account that image decoder might not
respect inSampleSize
- check rounded values so we don't have crop rects
that lie outside a bitmap's dimensions
- correctly set initial scale on bitmaps that are
larger than the screen size
- switch to using asynctask when setting wallpaper
dimensions
(cherry picked from commit
e39c9a953ca11319b747b3aa79f4ccd082b775b7)
Change-Id: I43372f0bff37f139c8bc83f9956a967d0b4a8708
Baligh Uddin [Wed, 19 Mar 2014 16:48:18 +0000 (09:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2a993d03ba28b42348c201919c4d1ab6bae23445
Auto-generated-cl: translation import
Robert Greenwalt [Wed, 19 Mar 2014 16:12:01 +0000 (16:12 +0000)]
Merge "Handle provisioning APN by turning off/on data." into klp-dev
Dan Sandler [Wed, 19 Mar 2014 13:04:00 +0000 (13:04 +0000)]
Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev
Jeff Brown [Wed, 19 Mar 2014 00:58:38 +0000 (17:58 -0700)]
Fix inverted conditional in View.setFilterTouchesWhenObscured.
Bug:
13530806
Change-Id: Icdaf909c355f5b22635e1060f2190502916b144f
Dave Platt [Wed, 19 Mar 2014 00:50:29 +0000 (00:50 +0000)]
Merge "Harden NsdManager against null-dereference crashes" into klp-dev
Jeff Brown [Wed, 19 Mar 2014 00:19:38 +0000 (00:19 +0000)]
Merge "Refresh cast icon assets to improve visual contrast." into klp-dev
Xia Wang [Tue, 18 Mar 2014 22:10:32 +0000 (22:10 +0000)]
Merge "Fix state transition verification." into klp-dev
Jeff Brown [Tue, 18 Mar 2014 20:41:31 +0000 (13:41 -0700)]
Refresh cast icon assets to improve visual contrast.
Bug:
13473719
Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa
Adrian Roos [Tue, 18 Mar 2014 21:03:15 +0000 (21:03 +0000)]
am
1f3186ee: (-s ours) am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
1f3186ee4505997ef3a235f669313236099308f4':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:59:28 +0000 (13:59 -0700)]
am
67a92975: am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
67a92975ac638db3d51ea4978cf78ee207fcceb7':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:53:17 +0000 (13:53 -0700)]
am
88da2bfa: am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
88da2bfaacaafebdd2e0fb9542386486b9594871':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:47:58 +0000 (13:47 -0700)]
am
ed529a5a: (-s ours) am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:41:20 +0000 (13:41 -0700)]
am
500ec9ce: am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
500ec9ce4b7856eca480c4c7dca8df1211614102':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:34:05 +0000 (13:34 -0700)]
am
25fb7133: am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
25fb7133901f6a538d5d365f3c0c1c936e76679d':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:28:17 +0000 (13:28 -0700)]
am
0b2f2122: am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:24:35 +0000 (13:24 -0700)]
am
d3da8f71: am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
d3da8f711ec642322e497a493985bed5c43f597b':
DO NOT MERGE - Fix keyguard pattern lockout bug
Adrian Roos [Tue, 18 Mar 2014 20:17:12 +0000 (13:17 -0700)]
am
ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug
* commit '
ecba937b005b07d72eadfaf93a200e0b14af2980':
DO NOT MERGE - Fix keyguard pattern lockout bug
Xia Wang [Tue, 4 Mar 2014 19:29:18 +0000 (11:29 -0800)]
Fix state transition verification.
When there is connectivity state change, the network states could be broadcasted multiple times.
The state transition should consider that.
Bug:
13277256
Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
(cherry picked from commit
71aae0b6fd1bb9204b81c2e9447f3544c29579c4)
Jeff Sharkey [Tue, 18 Feb 2014 22:25:47 +0000 (14:25 -0800)]
Lock down MANAGE_DOCUMENTS permission.
MANAGE_DOCUMENTS is a very broad permission, since it allows full
access to all DocumentsProviders. DocumentsUI should really be the
only app holding this permission; everyone else should rely on Uri
permission grants for access.
Bug:
12958298
Change-Id: I1def48a4ea1814e031fc8513c3cd051d764cd7f8