OSDN Git Service
Dianne Hackborn [Fri, 31 Jul 2015 18:26:19 +0000 (18:26 +0000)]
am
ebbc891a: Merge "Fix build." into mnc-dev
* commit '
ebbc891ae4ca835dea278430e3bad42d4630e2af':
Fix build.
Dianne Hackborn [Fri, 31 Jul 2015 18:19:11 +0000 (18:19 +0000)]
Merge "Fix build." into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 18:17:43 +0000 (11:17 -0700)]
Fix build.
Change-Id: I9c6b6cd354039ff2914837cfe97a783564ded66f
Glenn Kasten [Fri, 31 Jul 2015 18:10:39 +0000 (18:10 +0000)]
am
37f559be: Merge "Improve getTimestamp documentation" into mnc-dev
* commit '
37f559be42ef7a765c671cc0852289a9d7e047cc':
Improve getTimestamp documentation
Glenn Kasten [Fri, 31 Jul 2015 18:04:16 +0000 (18:04 +0000)]
Merge "Improve getTimestamp documentation" into mnc-dev
Dianne Hackborn [Fri, 31 Jul 2015 17:43:08 +0000 (17:43 +0000)]
Dianne Hackborn [Fri, 31 Jul 2015 17:43:06 +0000 (17:43 +0000)]
am
c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '
c1836bb0f1bf3e5ef0911719525da0bab3e53507':
Change MNC codename to just M.
Dianne Hackborn [Fri, 31 Jul 2015 17:35:34 +0000 (10:35 -0700)]
Fix build.
Change-Id: Icdf6fa14e53a1c030d0d90205d3bf2d7610b6196
Dianne Hackborn [Wed, 29 Jul 2015 22:20:21 +0000 (15:20 -0700)]
Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
Dianne Hackborn [Fri, 31 Jul 2015 17:11:58 +0000 (17:11 +0000)]
Merge "Change MNC codename to just M." into mnc-dev
Tyler Gunn [Fri, 31 Jul 2015 15:50:21 +0000 (15:50 +0000)]
am
d0694da4: Merge "Add telecom extra keys required for DMR release." into mnc-dev
* commit '
d0694da4fb85bb01e7c0ea7989a78a0e635453ac':
Add telecom extra keys required for DMR release.
Tyler Gunn [Fri, 31 Jul 2015 15:42:48 +0000 (15:42 +0000)]
Merge "Add telecom extra keys required for DMR release." into mnc-dev
Julia Reynolds [Fri, 31 Jul 2015 13:56:56 +0000 (13:56 +0000)]
am
5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev
* commit '
5d6a2d387cd437e6d0c45d0df1bd10ba9db56253':
Fix SysUI crash on device boot.
Julia Reynolds [Fri, 31 Jul 2015 13:49:26 +0000 (13:49 +0000)]
Merge "Fix SysUI crash on device boot." into mnc-dev
Julia Reynolds [Fri, 31 Jul 2015 13:17:20 +0000 (09:17 -0400)]
Fix SysUI crash on device boot.
Bug:
22869066
Change-Id: I55ab64c430899ebc20bfc8a8e4d1e2a7cd12f0cd
Rubin Xu [Fri, 31 Jul 2015 13:14:50 +0000 (13:14 +0000)]
am
9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev
* commit '
9a81a182df634ab7a087752c9a10db67c5d0f256':
Don't always transfer device owner status to other users.
Rubin Xu [Fri, 31 Jul 2015 13:11:08 +0000 (13:11 +0000)]
Merge "Don't always transfer device owner status to other users." into mnc-dev
Benjamin Franz [Fri, 31 Jul 2015 09:42:40 +0000 (09:42 +0000)]
am
d692fcf1: Merge "Add missing return statement" into mnc-dev
* commit '
d692fcf115e57fef8a15c214fb2fcde78a48b45c':
Add missing return statement
Nicolas Prevot [Tue, 28 Jul 2015 19:41:12 +0000 (20:41 +0100)]
Don't always transfer device owner status to other users.
A device owner cannot use device or profile owner policies on
other users unless it is profile owner there. Also limit device
initializer to system apps only.
Bug:
21800830
Change-Id: Ie1abbd891945b91b17ecdf7f73ba93aaa19819be
Benjamin Franz [Fri, 31 Jul 2015 08:22:53 +0000 (08:22 +0000)]
Merge "Add missing return statement" into mnc-dev
Lorenzo Colitti [Fri, 31 Jul 2015 05:25:42 +0000 (05:25 +0000)]
am
496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
* commit '
496a9d269b0778ffa1965f3b11d768fe70fd7719':
Stop supporting legacy ConnectivityManager routing methods in M.
Lorenzo Colitti [Fri, 31 Jul 2015 05:17:08 +0000 (05:17 +0000)]
Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
Dave Langemak [Fri, 31 Jul 2015 02:56:51 +0000 (02:56 +0000)]
am
02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '
02565c3622aa9007d3d5eb4612f200decd05b55c':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Hung-ying Tyan [Fri, 31 Jul 2015 02:56:45 +0000 (02:56 +0000)]
am
410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '
410abcdb41f5bca84574e7b07d3f022d5e05e4c9':
Revise lockdown check in getLegacyVpnInfo()
Dave Langemak [Fri, 31 Jul 2015 02:52:30 +0000 (02:52 +0000)]
Merge changes from topic 'fix-notification-inflation-2' into mnc-dev
* changes:
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Hung-ying Tyan [Fri, 31 Jul 2015 02:51:32 +0000 (02:51 +0000)]
Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
Geoff Mendal [Fri, 31 Jul 2015 02:45:20 +0000 (02:45 +0000)]
am
bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
bbb47d88d5f129ab1ca30d6a7a41976e47681e37':
Import translations. DO NOT MERGE
Ronghua Wu [Fri, 31 Jul 2015 02:40:30 +0000 (02:40 +0000)]
am
e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev
* commit '
e8b7febd62f899ed8920cbd484e18dea64b3a7ee':
media: use blocks number to find closest size
Geoff Mendal [Fri, 31 Jul 2015 02:38:23 +0000 (02:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Dan Sandler [Fri, 31 Jul 2015 02:33:12 +0000 (22:33 -0400)]
Make DateTimeView more robust to weird contexts.
In particular, some clients (*ahem* SystemUI) have been
known to inflate RemoteViews with unusual derived contexts
that may not have valid application contexts. DateTimeView
can now resist this.
Bug:
22852700
Change-Id: I5e91ae0e66859f5f5efd7b19c0ae6dfbc26bcc54
Dan Sandler [Fri, 31 Jul 2015 02:32:54 +0000 (22:32 -0400)]
Make the RemoteViews context safe for Icons.
Icon needs the RemoteViews' internal context to reflect not
just the Resources of the originating application, but its
package name as well.
Bug:
22840771
Bug:
22852700
Change-Id: I1164cd38d99283982b00daadcf927c7cf63539b3
Ronghua Wu [Fri, 31 Jul 2015 02:32:53 +0000 (02:32 +0000)]
Merge "media: use blocks number to find closest size" into mnc-dev
Geoff Mendal [Fri, 31 Jul 2015 02:12:14 +0000 (19:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22826906
Change-Id: If1cb05eb42e8e5bd789cdb257dfc3498e4479890
Lorenzo Colitti [Wed, 29 Jul 2015 02:41:21 +0000 (11:41 +0900)]
Stop supporting legacy ConnectivityManager routing methods in M.
The methods startUsingNetworkFeature, stopUsingNetworkFeature and
requestRouteToHost were @removed in all the M preview builds, but
internal and external developers have noted that this imposes
additional burden for applications that need to work across
multiple platform versions because it causes compile-time errors.
We switched from @removed back to @deprecated to avoid these
problems. In order to effectively deprecate these methods, which
are error-prone and insecure, make them throw
UnsupportedOperationException if the app's target SDK is M or
above.
Because there are still one or two places in system code that use
these APIs, exempt Process.SYSTEM_UID and the OMA-DM client from
the check for now.
Bug:
22728205
Change-Id: I790bd32f3aa8067cbb625962a209bb9232f4b58c
Jeff Sharkey [Fri, 31 Jul 2015 01:51:29 +0000 (01:51 +0000)]
am
5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev
* commit '
5db4cc8fee8b919b5f62f222af92a4e995ca6a70':
Handle volumes without visible paths.
Jeff Sharkey [Fri, 31 Jul 2015 01:46:45 +0000 (01:46 +0000)]
Merge "Handle volumes without visible paths." into mnc-dev
Jeff Sharkey [Fri, 31 Jul 2015 01:10:20 +0000 (18:10 -0700)]
Handle volumes without visible paths.
Transient volumes like USB drives are not mounted as visible, so we
shouldn't be kicking off media scanner for them.
Bug:
22545248
Change-Id: Ic8f2d3134f1edb8b2a12e8ff283eceeeb230f48b
Adam Lesinski [Fri, 31 Jul 2015 00:35:12 +0000 (00:35 +0000)]
am
e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
* commit '
e3b0119f79d11744a7f590510b184feef0f45894':
AAPT: Fix resource versioning
Adam Lesinski [Fri, 31 Jul 2015 00:28:05 +0000 (00:28 +0000)]
Merge "AAPT: Fix resource versioning" into mnc-dev
Selim Cinek [Fri, 31 Jul 2015 00:06:10 +0000 (00:06 +0000)]
am
b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev
* commit '
b9f30b26707b7e8721b1cd03ca96b5a4a4995109':
The heads up now correctly dissapears when clicking
Amit Mahajan [Fri, 31 Jul 2015 00:01:50 +0000 (00:01 +0000)]
am
53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit '
53c750142332cb33e604266b7c6d09191c32691c':
Add OrSelf to privileged permission check.
Adam Lesinski [Fri, 31 Jul 2015 00:01:42 +0000 (00:01 +0000)]
am
00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit '
00f7cb924e6964c5403c55ae5e7348aad1c8ec7b':
BatteryStats: include mobile radio active count and unknown time in checkin
Selim Cinek [Thu, 30 Jul 2015 23:59:59 +0000 (23:59 +0000)]
Merge "The heads up now correctly dissapears when clicking" into mnc-dev
Amit Mahajan [Thu, 30 Jul 2015 23:54:06 +0000 (23:54 +0000)]
Merge "Add OrSelf to privileged permission check." into mnc-dev
Adam Lesinski [Thu, 30 Jul 2015 23:50:27 +0000 (23:50 +0000)]
Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
Adam Lesinski [Thu, 30 Jul 2015 23:36:29 +0000 (16:36 -0700)]
BatteryStats: include mobile radio active count and unknown time in checkin
These are important values to help diagnose modem related wakeup issues.
Bug:
22803686
Bug:
22857991
Change-Id: Ie0164ebd194567bc10d1165d671a583674a39829
Andre Eisenbach [Thu, 30 Jul 2015 23:48:07 +0000 (23:48 +0000)]
am
3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast
* commit '
3bf1ac54edc77d2249dc9a0ab8291efa70ff76b9':
Bluetooth: Don't call beginBroadcast() while in a broadcast
Selim Cinek [Thu, 30 Jul 2015 00:04:36 +0000 (17:04 -0700)]
The heads up now correctly dissapears when clicking
Bug:
22729955
Change-Id: I977b36823bf936baab527f932b1e5576241f4d71
Amit Mahajan [Thu, 30 Jul 2015 23:04:13 +0000 (16:04 -0700)]
Add OrSelf to privileged permission check.
Bug:
22857263
Change-Id: Ide7105dfd653e3c271330822fb8cee7cf620e35d
Andre Eisenbach [Thu, 30 Jul 2015 15:59:32 +0000 (08:59 -0700)]
Bluetooth: Don't call beginBroadcast() while in a broadcast
Block duplicate calls to beginBroadcast() and add try/finally
to ensure finishBroadcast() is always called.
Bug:
22800686
Change-Id: Ie8d4005f4cd50dd2544a2832773d72eab0015d92
Carlos Valdivia [Thu, 30 Jul 2015 22:06:10 +0000 (22:06 +0000)]
am
26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev
* commit '
26ae600b5fb8c657b4f8dc2700374c701c9e50ec':
Permissions: GET_ACCOUNTS permission cleanup
Deepanshu Gupta [Thu, 30 Jul 2015 22:06:02 +0000 (22:06 +0000)]
am
7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* commit '
7676e403bd65435eb3d2f34e7e0174fd37f6e818':
Update status bar time.
Fix imports.
Add MockView constructor used by LayoutInflater.
Poor implementation of Path.approximate()
Include EpicenterTranslateClipReveal in LayoutLib
Fix theme namespace in tests.
LayoutLib: fix layout when nav bar is absent.
LayoutLib: Fix Status/Navigation Bar color.
Carlos Valdivia [Thu, 30 Jul 2015 21:58:16 +0000 (21:58 +0000)]
Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev
Deepanshu Gupta [Thu, 30 Jul 2015 21:58:03 +0000 (21:58 +0000)]
Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* changes:
Update status bar time.
Fix imports.
Add MockView constructor used by LayoutInflater.
Poor implementation of Path.approximate()
Include EpicenterTranslateClipReveal in LayoutLib
Fix theme namespace in tests.
LayoutLib: fix layout when nav bar is absent.
LayoutLib: Fix Status/Navigation Bar color.
Selim Cinek [Thu, 30 Jul 2015 21:54:39 +0000 (21:54 +0000)]
am
20a5d331: Merge "Fixed a heads up crash" into mnc-dev
* commit '
20a5d3317529ce573aa06ac2e4a0a1a5359f80d7':
Fixed a heads up crash
Selim Cinek [Thu, 30 Jul 2015 21:45:55 +0000 (21:45 +0000)]
Merge "Fixed a heads up crash" into mnc-dev
Phil Burk [Thu, 30 Jul 2015 21:41:41 +0000 (21:41 +0000)]
am
8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev
* commit '
8f5228afe671b5e80fab4d1c55452ad6c83ef4f1':
UsbMidiDevice: add timestamps for input events
Phil Burk [Thu, 30 Jul 2015 21:41:33 +0000 (21:41 +0000)]
am
2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev
* commit '
2f1a08e601f4fa24e589fc61ea38f80eb264a8f4':
MIDI docs BTLE: how to open BTLE MIDI devices
Phil Burk [Thu, 30 Jul 2015 21:41:26 +0000 (21:41 +0000)]
am
fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev
* commit '
fdcd82164f95699c36e044f90a12b9aa1c4f662f':
MIDI package doc: add hasSystemFeature() call
Phil Burk [Thu, 30 Jul 2015 21:41:19 +0000 (21:41 +0000)]
am
559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev
* commit '
559a2420d396ef7a7c7bcab012bef379ad864bff':
MidiDevice: document that opens can return nulls
Phil Burk [Thu, 30 Jul 2015 21:28:17 +0000 (21:28 +0000)]
Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev
Phil Burk [Thu, 30 Jul 2015 21:27:47 +0000 (21:27 +0000)]
Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev
Phil Burk [Thu, 30 Jul 2015 21:27:25 +0000 (21:27 +0000)]
Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev
Phil Burk [Thu, 30 Jul 2015 21:26:48 +0000 (21:26 +0000)]
Merge "MidiDevice: document that opens can return nulls" into mnc-dev
Tyler Gunn [Thu, 30 Jul 2015 21:18:33 +0000 (14:18 -0700)]
Add telecom extra keys required for DMR release.
Bug:
22848290
Change-Id: I3328234e3f07d83d0dbe5b61b959344b6cc5cc3f
Fyodor Kupolov [Thu, 30 Jul 2015 20:58:37 +0000 (20:58 +0000)]
am
4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
4988378cd0f1bb6cdd83f797d10fd45105672296':
Introduced android.permission.PEERS_MAC_ADDRESS permission
Fyodor Kupolov [Thu, 30 Jul 2015 20:50:04 +0000 (20:50 +0000)]
Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
Shawn Willden [Thu, 30 Jul 2015 20:04:12 +0000 (20:04 +0000)]
am
75e51ec0: Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev
* commit '
75e51ec0b14e9c5363ad86a69fd7a764290a5cfb':
Raw RSA Cipher relies on keymaster for padding and range checks.
Ronghua Wu [Thu, 30 Jul 2015 17:54:47 +0000 (10:54 -0700)]
media: use blocks number to find closest size
Bug:
22504214
Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
Shawn Willden [Thu, 30 Jul 2015 19:57:22 +0000 (19:57 +0000)]
Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev
Chris Craik [Thu, 30 Jul 2015 19:35:51 +0000 (19:35 +0000)]
am
730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev
* commit '
730c0f6591b1c99699e9d0ecf36d696f7d87629f':
Fix stencil mask usage in HWUI
Chris Craik [Thu, 30 Jul 2015 19:30:58 +0000 (19:30 +0000)]
Merge "Fix stencil mask usage in HWUI" into mnc-dev
Shishir Agrawal [Thu, 30 Jul 2015 19:02:14 +0000 (19:02 +0000)]
am
8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev
* commit '
8d1d8fdaa40cc2149604c9947a7ccf1a6a494e36':
Add SMS permissions for Carrier app.
Shishir Agrawal [Thu, 30 Jul 2015 18:54:49 +0000 (18:54 +0000)]
Merge "Add SMS permissions for Carrier app." into mnc-dev
Chris Craik [Thu, 30 Jul 2015 18:05:16 +0000 (11:05 -0700)]
Fix stencil mask usage in HWUI
bug:
21588246
Ensure we always set the mask before clearing, and removes
some unneeded optimizations around mask usage in
debug (overdraw) mode.
Change-Id: I71ed06c16f8d9f158953d5aa160098514f0f7f00
Chris Tate [Thu, 30 Jul 2015 17:36:46 +0000 (17:36 +0000)]
am
74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev
* commit '
74a0744ec19de54096638978bfe1eccfe2ed4e01':
Fix issues around process teardown after full-data restore
Chris Tate [Thu, 30 Jul 2015 17:28:07 +0000 (17:28 +0000)]
Merge "Fix issues around process teardown after full-data restore" into mnc-dev
Simranjit Kohli [Thu, 30 Jul 2015 17:22:34 +0000 (17:22 +0000)]
am
964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev
* commit '
964a41214d19f00e8420500ccaa29e0902933c7e':
[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it.
Alan Viverette [Thu, 30 Jul 2015 17:22:27 +0000 (17:22 +0000)]
am
559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
* commit '
559daf7a749514065c6c482503a86a528addc985':
Include non-zero dimension views in excess space calculation
Dan Sandler [Thu, 30 Jul 2015 17:22:14 +0000 (17:22 +0000)]
am
7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.
* commit '
7bd8e6a8f2d0d200fd9a74b55469492cc02de6a4':
DateTimeView: don't assume you have an ApplicationContext.
Alan Viverette [Thu, 30 Jul 2015 17:22:04 +0000 (17:22 +0000)]
am
c1d5b6c1: Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev
* commit '
c1d5b6c18c3b92708958daa998da2ec55adce00e':
Move padding from navigation and overflow icons to Toolbar
Simranjit Kohli [Thu, 30 Jul 2015 17:09:44 +0000 (17:09 +0000)]
Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev
Glenn Kasten [Fri, 24 Jul 2015 17:56:46 +0000 (10:56 -0700)]
Improve getTimestamp documentation
Bug:
18977548
Change-Id: Ia3c2620b27a173ed1a15268ca43c28e6f4e31965
Alan Viverette [Thu, 30 Jul 2015 17:02:45 +0000 (17:02 +0000)]
Merge "Include non-zero dimension views in excess space calculation" into mnc-dev
Carlos Valdivia [Mon, 27 Jul 2015 20:06:54 +0000 (13:06 -0700)]
Permissions: GET_ACCOUNTS permission cleanup
First, getAccounts*() will now return all available accounts depending
on both GET_ACCOUNTS grants and signature matching. This is different
from before where a caller of getAccounts() would need GET_ACCOUNTS to
get any accounts, but if that same caller called getAccountsByType, they
might have gotten back accounts if they shared a signature with the same
developer.
Second, cleaned up some NPEs and javadoc.
This change was motivated by progress on the cts tests.
Change-Id: I2f36226780e074fdf58214b46de3b79d8319ace1
Dan Sandler [Thu, 30 Jul 2015 15:46:10 +0000 (11:46 -0400)]
DateTimeView: don't assume you have an ApplicationContext.
Bug:
22840771
Change-Id: I3be6369936f90e9ce4e61a59ea81b0d3408a0f99
Elliott Hughes [Thu, 30 Jul 2015 15:46:55 +0000 (15:46 +0000)]
am
204b4157: am
f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '
204b4157b3fdbeea8859c4ad0e29be18d74e6f5f':
Use _WIN32 rather than HAVE_WINSOCK.
Alan Viverette [Thu, 30 Jul 2015 15:44:12 +0000 (11:44 -0400)]
Include non-zero dimension views in excess space calculation
Bug:
22840778
Change-Id: Iba44c59bbaa48f63b26f342e0510b4c421e8748b
Elliott Hughes [Thu, 30 Jul 2015 15:32:51 +0000 (15:32 +0000)]
am
f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '
f8a6a2f602ad4ec049b2d2d4741571a76c3d014b':
Use _WIN32 rather than HAVE_WINSOCK.
Elliott Hughes [Thu, 30 Jul 2015 15:19:09 +0000 (15:19 +0000)]
Merge "Use _WIN32 rather than HAVE_WINSOCK."
Benjamin Franz [Thu, 30 Jul 2015 14:50:16 +0000 (15:50 +0100)]
Add missing return statement
Bug:
22844272
Change-Id: I4b37b28adb1d1b6d0d1235dd68fbfad6c3121c54
Alan Viverette [Thu, 30 Jul 2015 14:50:07 +0000 (14:50 +0000)]
Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev
Alan Viverette [Thu, 30 Jul 2015 14:17:39 +0000 (10:17 -0400)]
Move padding from navigation and overflow icons to Toolbar
Also removes unused default_padding_material dimension.
Bug:
18482784
Change-Id: If294f61391bc76034feb8222d74f40d6b29857c5
Jim Miller [Thu, 30 Jul 2015 04:44:46 +0000 (04:44 +0000)]
am
30c5da9c: Don\'t call cancel() when fingerprint auth fails
* commit '
30c5da9cc20cc4b9ce820963c6f58d7826f46eaa':
Don't call cancel() when fingerprint auth fails
Jim Miller [Fri, 17 Jul 2015 21:11:56 +0000 (14:11 -0700)]
Don't call cancel() when fingerprint auth fails
KeyguardUpdateMonitor should not call cancel() when fingerprint
auth fails. The life cycle will continue until an actual error
occurs or the maximum number of retries is reached.
Fixes bug
22562277
Change-Id: I36291d025de9c049cc7f7924f692c8c21349bb7b
Daniel Sandler [Thu, 30 Jul 2015 03:12:32 +0000 (03:12 +0000)]
am
bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev
* commit '
bbe1682b1652c37b66609676e5829517279ff141':
Fully support Icons in Notification actions.
Fix media notification action icons.
Daniel Sandler [Thu, 30 Jul 2015 02:57:06 +0000 (02:57 +0000)]
Merge changes from topic 'fix-media-notifications' into mnc-dev
* changes:
Fully support Icons in Notification actions.
Fix media notification action icons.
Hung-ying Tyan [Wed, 29 Jul 2015 04:39:21 +0000 (12:39 +0800)]
Revise lockdown check in getLegacyVpnInfo()
Return null instead of raising exception in lockdown mode.
BUG=
22749146
Change-Id: I0e9e3ded0d189e3fa9e872b7af9fe363799c85d6
Simranjit Singh Kohli [Wed, 29 Jul 2015 23:34:49 +0000 (16:34 -0700)]
[Improve docs for AccountManager]
Currently, the docs for AccountManager are somewhat misleading and may
cause developer errors. To avoid them, we are properly documenting it.
Bug:
21924096
Change-Id: If775a54a09219b0f1623d2ff903085b9d12aa863
Christopher Tate [Thu, 30 Jul 2015 02:23:58 +0000 (19:23 -0700)]
Fix issues around process teardown after full-data restore
The unified code path for cleanup was mistakenly looking at the
android:killAfterRestore manifest attribute even for full-data restore
operations. That attribute is only relevant for key/value payload
handling. We need to *always* kill after restore in the full-data
case because the app will otherwise be allowed to enter normal
component lifecycles without its correct Application / ContentProvider
state in force.
Bug
22704852
Change-Id: Ia63f985a35c28084c734389cfc49d3792173e5c7