197979 Commits

Author SHA1 Message Date
Rubin Xu
9a81a182df Merge "Don't always transfer device owner status to other users." into mnc-dev 2015-07-31 13:11:08 +00:00
Nicolas Prevot
e2a4a6ff8a 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
2015-07-31 09:32:15 +01:00
Benjamin Franz
d692fcf115 Merge "Add missing return statement" into mnc-dev 2015-07-31 08:22:53 +00:00
Lorenzo Colitti
496a9d269b Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev 2015-07-31 05:17:08 +00:00
Wale Ogunwale
b3eba81442 Fixed issue with artifacts during scale-up transition animation
It is possible to get some artifacts during scale-up transition
animation of some fullscreen activities like Chrome. This is
caused by the clip rect specified by the transformation extending
outside the sys decor rect. We now contain the clip rect within
the system decor rect.

Also note that we don't want to do this for none-fullscreen
activities as it might cause some premature clipping.

Bug: 22830775
Bug: 21727851
Bug: 20652683
Bug: 19523205
Bug: 15046646
https://code.google.com/p/android/issues/detail?id=161362

Change-Id: I33827caaa256ad8fdc0eb3650ef34e95c48a6988
2015-07-30 20:20:16 -07:00
Dave Langemak
02565c3622 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.
2015-07-31 02:52:30 +00:00
Hung-ying Tyan
410abcdb41 Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev 2015-07-31 02:51:32 +00:00
Geoff Mendal
bbb47d88d5 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-31 02:38:23 +00:00
Dan Sandler
4b67713709 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
2015-07-30 22:33:12 -04:00
Dan Sandler
706274f7ff 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
2015-07-30 22:32:54 -04:00
Ronghua Wu
e8b7febd62 Merge "media: use blocks number to find closest size" into mnc-dev 2015-07-31 02:32:53 +00:00
Geoff Mendal
e0217b1a9a Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22826906
Change-Id: If1cb05eb42e8e5bd789cdb257dfc3498e4479890
2015-07-30 19:12:14 -07:00
Lorenzo Colitti
ffc42b0b7b 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
2015-07-31 11:08:27 +09:00
Jeff Sharkey
5db4cc8fee Merge "Handle volumes without visible paths." into mnc-dev 2015-07-31 01:46:45 +00:00
Jeff Sharkey
865ea7c800 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
2015-07-30 18:10:39 -07:00
Adam Lesinski
e3b0119f79 Merge "AAPT: Fix resource versioning" into mnc-dev 2015-07-31 00:28:05 +00:00
Selim Cinek
b9f30b2670 Merge "The heads up now correctly dissapears when clicking" into mnc-dev 2015-07-30 23:59:59 +00:00
Amit Mahajan
53c7501423 Merge "Add OrSelf to privileged permission check." into mnc-dev 2015-07-30 23:54:06 +00:00
Adam Lesinski
00f7cb924e Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev 2015-07-30 23:50:27 +00:00
Adam Lesinski
782327bde7 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
2015-07-30 23:50:10 +00:00
Selim Cinek
0fccc729fd The heads up now correctly dissapears when clicking
Bug: 22729955
Change-Id: I977b36823bf936baab527f932b1e5576241f4d71
2015-07-30 23:05:42 +00:00
Amit Mahajan
a9e72a7653 Add OrSelf to privileged permission check.
Bug: 22857263
Change-Id: Ide7105dfd653e3c271330822fb8cee7cf620e35d
2015-07-30 16:04:13 -07:00
Andre Eisenbach
3bf1ac54ed 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
2015-07-30 22:30:42 +00:00
Carlos Valdivia
26ae600b5f Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev 2015-07-30 21:58:16 +00:00
Deepanshu Gupta
7676e403bd 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.
2015-07-30 21:58:03 +00:00
Selim Cinek
20a5d33175 Merge "Fixed a heads up crash" into mnc-dev 2015-07-30 21:45:55 +00:00
Phil Burk
8f5228afe6 Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev 2015-07-30 21:28:17 +00:00
Phil Burk
2f1a08e601 Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 2015-07-30 21:27:47 +00:00
Phil Burk
fdcd82164f Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 2015-07-30 21:27:25 +00:00
Phil Burk
559a2420d3 Merge "MidiDevice: document that opens can return nulls" into mnc-dev 2015-07-30 21:26:48 +00:00
Tyler Gunn
335ff2ec7a Add telecom extra keys required for DMR release.
Bug: 22848290
Change-Id: I3328234e3f07d83d0dbe5b61b959344b6cc5cc3f
2015-07-30 14:18:33 -07:00
Fyodor Kupolov
4988378cd0 Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev 2015-07-30 20:50:04 +00:00
Chris Wren
dcc34fd8a3 Instrument printing service for metrics collection.
Bug: 22837316
Change-Id: I8bf62940f5eb495d8d7a10df958d9bc8ad76662a
2015-07-30 16:29:20 -04:00
Ronghua Wu
e595268e98 media: use blocks number to find closest size
Bug: 22504214
Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
2015-07-30 13:01:20 -07:00
Shawn Willden
75e51ec0b1 Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev 2015-07-30 19:57:22 +00:00
Chris Craik
730c0f6591 Merge "Fix stencil mask usage in HWUI" into mnc-dev 2015-07-30 19:30:58 +00:00
Shishir Agrawal
8d1d8fdaa4 Merge "Add SMS permissions for Carrier app." into mnc-dev 2015-07-30 18:54:49 +00:00
Chris Craik
fa51a0e1ce 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
2015-07-30 11:06:53 -07:00
Chris Tate
74a0744ec1 Merge "Fix issues around process teardown after full-data restore" into mnc-dev 2015-07-30 17:28:07 +00:00
Simranjit Kohli
964a41214d 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 2015-07-30 17:09:44 +00:00
Glenn Kasten
00908b6c69 Improve getTimestamp documentation
Bug: 18977548
Change-Id: Ia3c2620b27a173ed1a15268ca43c28e6f4e31965
2015-07-30 10:07:34 -07:00
Alan Viverette
559daf7a74 Merge "Include non-zero dimension views in excess space calculation" into mnc-dev 2015-07-30 17:02:45 +00:00
Carlos Valdivia
e7ed827a10 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
2015-07-30 09:18:53 -07:00
Dan Sandler
7bd8e6a8f2 DateTimeView: don't assume you have an ApplicationContext.
Bug: 22840771
Change-Id: I3be6369936f90e9ce4e61a59ea81b0d3408a0f99
2015-07-30 11:59:30 -04:00
Alan Viverette
da2f304409 Include non-zero dimension views in excess space calculation
Bug: 22840778
Change-Id: Iba44c59bbaa48f63b26f342e0510b4c421e8748b
2015-07-30 11:44:12 -04:00
Benjamin Franz
9dacbf6fd4 Add missing return statement
Bug: 22844272
Change-Id: I4b37b28adb1d1b6d0d1235dd68fbfad6c3121c54
2015-07-30 15:50:16 +01:00
Alan Viverette
c1d5b6c18c Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev 2015-07-30 14:50:07 +00:00
Michael Wright
5e829abd71 Make the NullVibrator really null.
Currently any calls into vibrate just end up in an infinite loop
until the program's stack overflows.

Bug: 22835503
Change-Id: I640c3990b597ac69d83b3656e00daad088002982
2015-07-30 15:49:50 +01:00
Alan Viverette
fb61bb5028 Move padding from navigation and overflow icons to Toolbar
Also removes unused default_padding_material dimension.

Bug: 18482784
Change-Id: If294f61391bc76034feb8222d74f40d6b29857c5
2015-07-30 10:17:39 -04:00
Jim Miller
30c5da9cc2 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
2015-07-30 04:31:37 +00:00