OSDN Git Service
Julia Reynolds [Fri, 31 Jul 2015 14:09:06 +0000 (14:09 +0000)]
am
e787bfa2: am
9bc94698: am
5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev
* commit '
e787bfa209a4fa6fc2f4cd754492a13472952c5c':
Fix SysUI crash on device boot.
Julia Reynolds [Fri, 31 Jul 2015 14:02:01 +0000 (14:02 +0000)]
am
9bc94698: am
5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev
* commit '
9bc9469807703757f50fffd34ed6b3f6183cdc6e':
Fix SysUI crash on device boot.
Julia Reynolds [Fri, 31 Jul 2015 13:57:02 +0000 (13:57 +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
Rubin Xu [Fri, 31 Jul 2015 13:28:42 +0000 (13:28 +0000)]
am
6501720c: am
489043d4: am
9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev
* commit '
6501720c721f2a0997d7cdd45303ed14eb54ded7':
Don't always transfer device owner status to other users.
Rubin Xu [Fri, 31 Jul 2015 13:21:31 +0000 (13:21 +0000)]
am
489043d4: am
9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev
* commit '
489043d49be1ea66b7714666193e69399cffa223':
Don't always transfer device owner status to other users.
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:15:44 +0000 (13:15 +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:56:13 +0000 (09:56 +0000)]
am
93d45d1c: am
982daf87: am
d692fcf1: Merge "Add missing return statement" into mnc-dev
* commit '
93d45d1c22d277abd182e01a7afee93b5015dbd6':
Add missing return statement
Benjamin Franz [Fri, 31 Jul 2015 09:47:55 +0000 (09:47 +0000)]
am
982daf87: am
d692fcf1: Merge "Add missing return statement" into mnc-dev
* commit '
982daf8769bf78dd6bb240dab9ac7d0a62de21cc':
Add missing return statement
Benjamin Franz [Fri, 31 Jul 2015 09:42:43 +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:37:15 +0000 (05:37 +0000)]
am
c7a86e90: am
c70348c1: am
496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
* commit '
c7a86e90ea5f61e9135e2f9acae0c5c3f37522fc':
Stop supporting legacy ConnectivityManager routing methods in M.
Lorenzo Colitti [Fri, 31 Jul 2015 05:31:04 +0000 (05:31 +0000)]
am
c70348c1: am
496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev
* commit '
c70348c194a26176ac54720fe4eabeeb7e4d9993':
Stop supporting legacy ConnectivityManager routing methods in M.
Lorenzo Colitti [Fri, 31 Jul 2015 05:24:49 +0000 (05:24 +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 03:10:40 +0000 (03:10 +0000)]
am
72dcb47d: am
b880a036: am
02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '
72dcb47d945a5a9e35059c01cd8a1593e6740a42':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Hung-ying Tyan [Fri, 31 Jul 2015 03:10:33 +0000 (03:10 +0000)]
am
7b2b74e1: am
135c3791: am
410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '
7b2b74e13a1d6b88b0ba8c4d8d7fd5e11a30d2d1':
Revise lockdown check in getLegacyVpnInfo()
Dave Langemak [Fri, 31 Jul 2015 03:04:26 +0000 (03:04 +0000)]
am
b880a036: am
02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev
* commit '
b880a036b12c8a8613fbd7fb41328ca93146bf85':
Make DateTimeView more robust to weird contexts.
Make the RemoteViews context safe for Icons.
Hung-ying Tyan [Fri, 31 Jul 2015 03:04:22 +0000 (03:04 +0000)]
am
135c3791: am
410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '
135c379115260f672fec023b0f9a020b8c51302b':
Revise lockdown check in getLegacyVpnInfo()
Geoff Mendal [Fri, 31 Jul 2015 02:57:31 +0000 (02:57 +0000)]
am
50265fc2: (-s ours) am
44718c4b: (-s ours) am
bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
50265fc2a316b9a2cea168c086b44280371b04e0':
Import translations. DO NOT MERGE
Dave Langemak [Fri, 31 Jul 2015 02:57:24 +0000 (02:57 +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:57:19 +0000 (02:57 +0000)]
am
410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
* commit '
410abcdb41f5bca84574e7b07d3f022d5e05e4c9':
Revise lockdown check in getLegacyVpnInfo()
Ronghua Wu [Fri, 31 Jul 2015 02:53:03 +0000 (02:53 +0000)]
am
fc1bcc37: am
0278f2bf: am
e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev
* commit '
fc1bcc37a6ebc466306f2b33c57e95cea69b693c':
media: use blocks number to find closest size
Geoff Mendal [Fri, 31 Jul 2015 02:52:57 +0000 (02:52 +0000)]
am
9eb20882: (-s ours) am
84ddee2e: (-s ours) Import translations. DO NOT MERGE
* commit '
9eb208829832a6f536912169114695f6fd85a55b':
Import translations. DO NOT MERGE
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.
Geoff Mendal [Fri, 31 Jul 2015 02:51:58 +0000 (02:51 +0000)]
am
44718c4b: (-s ours) am
bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
44718c4b8b3c7655ecc34981c8ee41e1daf34f00':
Import translations. DO NOT MERGE
Hung-ying Tyan [Fri, 31 Jul 2015 02:51:32 +0000 (02:51 +0000)]
Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev
Ronghua Wu [Fri, 31 Jul 2015 02:47:35 +0000 (02:47 +0000)]
am
0278f2bf: am
e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev
* commit '
0278f2bf2d627af718a7540f8c6aaa8a359caae6':
media: use blocks number to find closest size
Geoff Mendal [Fri, 31 Jul 2015 02:47:31 +0000 (02:47 +0000)]
am
84ddee2e: (-s ours) Import translations. DO NOT MERGE
* commit '
84ddee2e53f03f5a802191732670010e74375d59':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 31 Jul 2015 02:45:21 +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:28 +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:15:21 +0000 (19:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22826906
Change-Id: I1c6a84cee28d64dad3b53e727252d237824b673d
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 02:07:45 +0000 (02:07 +0000)]
am
e7477002: am
0eaadbc2: am
5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev
* commit '
e7477002683a83ce3022365fe6c327bbc31055cc':
Handle volumes without visible paths.
Jeff Sharkey [Fri, 31 Jul 2015 01:57:43 +0000 (01:57 +0000)]
am
0eaadbc2: am
5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev
* commit '
0eaadbc2a9b7350ba839ad14590c34235e42e28b':
Handle volumes without visible paths.
Jeff Sharkey [Fri, 31 Jul 2015 01:51:37 +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:48:50 +0000 (00:48 +0000)]
am
b9904daa: am
15724ffc: am
e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
* commit '
b9904daa7892328fea10bbbab521d080f5874961':
AAPT: Fix resource versioning
Adam Lesinski [Fri, 31 Jul 2015 00:43:04 +0000 (00:43 +0000)]
am
15724ffc: am
e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev
* commit '
15724ffc412fbc2147432f07e6aec20aecc74994':
AAPT: Fix resource versioning
Adam Lesinski [Fri, 31 Jul 2015 00:35:18 +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:23:52 +0000 (00:23 +0000)]
am
73168821: am
5b5d9129: am
b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev
* commit '
73168821c81da3e26974b69e5edefc913652db36':
The heads up now correctly dissapears when clicking
Selim Cinek [Fri, 31 Jul 2015 00:16:59 +0000 (00:16 +0000)]
am
5b5d9129: am
b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev
* commit '
5b5d9129134881f84ff80f5b16bce5e64670b545':
The heads up now correctly dissapears when clicking
Amit Mahajan [Fri, 31 Jul 2015 00:13:55 +0000 (00:13 +0000)]
am
d247d8b4: am
135e2ce5: am
53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit '
d247d8b4aa6eff39fad55c04e47d0d92d9c69751':
Add OrSelf to privileged permission check.
Adam Lesinski [Fri, 31 Jul 2015 00:13:49 +0000 (00:13 +0000)]
am
eec946aa: am
ee6046ad: am
00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit '
eec946aacd4fd5cd7dcb602e1085e78c816be416':
BatteryStats: include mobile radio active count and unknown time in checkin
Selim Cinek [Fri, 31 Jul 2015 00:08:00 +0000 (00:08 +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
Andre Eisenbach [Fri, 31 Jul 2015 00:06:54 +0000 (00:06 +0000)]
am
7ab51f50: am
7b3f6d56: am
3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast
* commit '
7ab51f5023e1e16b9457095032f37f8e83bb594c':
Bluetooth: Don't call beginBroadcast() while in a broadcast
Amit Mahajan [Fri, 31 Jul 2015 00:05:27 +0000 (00:05 +0000)]
am
135e2ce5: am
53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit '
135e2ce571fee7d64572454f55151225bcf22464':
Add OrSelf to privileged permission check.
Adam Lesinski [Fri, 31 Jul 2015 00:05:22 +0000 (00:05 +0000)]
am
ee6046ad: am
00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev
* commit '
ee6046add136d4791e71fb17a07076b425b7250c':
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:58:34 +0000 (23:58 +0000)]
am
53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit '
53c750142332cb33e604266b7c6d09191c32691c':
Add OrSelf to privileged permission check.
Andre Eisenbach [Thu, 30 Jul 2015 23:58:31 +0000 (23:58 +0000)]
am
7b3f6d56: am
3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast
* commit '
7b3f6d5683d16917507333daf08692761e18595d':
Bluetooth: Don't call beginBroadcast() while in a broadcast
Adam Lesinski [Thu, 30 Jul 2015 23:58:30 +0000 (23:58 +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
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:47:30 +0000 (23:47 +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:21:20 +0000 (22:21 +0000)]
am
f725a702: am
e195d179: am
26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev
* commit '
f725a702aa41d90231fe207c9fe59f1475508a00':
Permissions: GET_ACCOUNTS permission cleanup
Deepanshu Gupta [Thu, 30 Jul 2015 22:21:13 +0000 (22:21 +0000)]
am
24578570: am
3991bea8: am
7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* commit '
24578570432a4a1ec864b0ca364b38d24093c2ba':
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 22:13:08 +0000 (22:13 +0000)]
am
e195d179: am
26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev
* commit '
e195d179490754bc9358afe8ba74ecc38aed2360':
Permissions: GET_ACCOUNTS permission cleanup
Deepanshu Gupta [Thu, 30 Jul 2015 22:13:02 +0000 (22:13 +0000)]
am
3991bea8: am
7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev
* commit '
3991bea8ae768bdb7014deba2ad9e564cdea9ebd':
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 22:09:41 +0000 (22:09 +0000)]
am
7d1a4b63: am
fb2f9c02: am
20a5d331: Merge "Fixed a heads up crash" into mnc-dev
* commit '
7d1a4b63181a04bae6b16a63bb7491f19d80594b':
Fixed a heads up crash
Carlos Valdivia [Thu, 30 Jul 2015 22:07:31 +0000 (22:07 +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:07:27 +0000 (22:07 +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.
Selim Cinek [Thu, 30 Jul 2015 22:02:51 +0000 (22:02 +0000)]
am
fb2f9c02: am
20a5d331: Merge "Fixed a heads up crash" into mnc-dev
* commit '
fb2f9c0209708936408bea3b273d550aab6d4ec8':
Fixed a heads up crash
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.
Phil Burk [Thu, 30 Jul 2015 21:57:09 +0000 (21:57 +0000)]
am
ed839f59: am
e2823cb3: am
8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev
* commit '
ed839f59faa665dc18183a6e156c3e44209b5211':
UsbMidiDevice: add timestamps for input events
Phil Burk [Thu, 30 Jul 2015 21:57:03 +0000 (21:57 +0000)]
am
42d2aaa0: am
3eb45836: am
2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev
* commit '
42d2aaa07c6ce3dd94a9f850dfc32add1bbb49bf':
MIDI docs BTLE: how to open BTLE MIDI devices
Phil Burk [Thu, 30 Jul 2015 21:56:57 +0000 (21:56 +0000)]
am
de6272a7: am
9d4fad24: am
fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev
* commit '
de6272a7d62ba94050a0eaf2fb7d1838a92c124a':
MIDI package doc: add hasSystemFeature() call
Phil Burk [Thu, 30 Jul 2015 21:56:50 +0000 (21:56 +0000)]
am
4f84e648: am
6bf9b8ca: am
559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev
* commit '
4f84e648c461b385bb6e5fc666f88d65a4bcb9b9':
MidiDevice: document that opens can return nulls
Fyodor Kupolov [Thu, 30 Jul 2015 21:56:43 +0000 (21:56 +0000)]
am
df961732: am
f9fdb08c: am
4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
df9617328877f809594037ccb0c251df26e46f4b':
Introduced android.permission.PEERS_MAC_ADDRESS permission
Aravind Akella [Thu, 30 Jul 2015 21:56:36 +0000 (21:56 +0000)]
am
e025f4d9: am
ccaf066d: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dr-dev
* commit '
e025f4d992134c7a442711588b260850a2375da2':
Call getInstanceForPackage instead of creating a new SensorManager instance.
Selim Cinek [Thu, 30 Jul 2015 21:54:35 +0000 (21:54 +0000)]
am
20a5d331: Merge "Fixed a heads up crash" into mnc-dev
* commit '
20a5d3317529ce573aa06ac2e4a0a1a5359f80d7':
Fixed a heads up crash
Phil Burk [Thu, 30 Jul 2015 21:50:02 +0000 (21:50 +0000)]
am
e2823cb3: am
8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev
* commit '
e2823cb3dbe15d1c3dbd6253f28982765a7451d5':
UsbMidiDevice: add timestamps for input events
Phil Burk [Thu, 30 Jul 2015 21:49:57 +0000 (21:49 +0000)]
am
3eb45836: am
2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev
* commit '
3eb45836003e92830ff423f9260ce326e6e7f607':
MIDI docs BTLE: how to open BTLE MIDI devices
Phil Burk [Thu, 30 Jul 2015 21:49:52 +0000 (21:49 +0000)]
am
9d4fad24: am
fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev
* commit '
9d4fad246fe940548eff33c9d22c429428f6510b':
MIDI package doc: add hasSystemFeature() call
Phil Burk [Thu, 30 Jul 2015 21:49:47 +0000 (21:49 +0000)]
am
6bf9b8ca: am
559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev
* commit '
6bf9b8ca5926fa52aab6b428586081a76beb3266':
MidiDevice: document that opens can return nulls
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:03 +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:40:58 +0000 (21:40 +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:40:53 +0000 (21:40 +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:40:46 +0000 (21:40 +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
Fyodor Kupolov [Thu, 30 Jul 2015 21:05:48 +0000 (21:05 +0000)]
am
f9fdb08c: am
4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '
f9fdb08caae30e789d573ab3260fc87e9d43041b':
Introduced android.permission.PEERS_MAC_ADDRESS permission