OSDN Git Service
Jeff Sharkey [Thu, 6 Aug 2015 19:49:35 +0000 (19:49 +0000)]
am
0c2df694: am
7d28ad9b: am
cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev
* commit '
0c2df6944c83eee291f3b8e588eed7adba401d46':
Protect runtime storage mount points.
Jeff Sharkey [Thu, 6 Aug 2015 19:43:57 +0000 (19:43 +0000)]
am
7d28ad9b: am
cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev
* commit '
7d28ad9b638a8184ab499cbe708d3427025e569b':
Protect runtime storage mount points.
Jeff Sharkey [Thu, 6 Aug 2015 19:36:01 +0000 (19:36 +0000)]
am
cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev
* commit '
cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
Protect runtime storage mount points.
Chris Wren [Thu, 6 Aug 2015 19:32:49 +0000 (19:32 +0000)]
am
8a38babb: am
062130d9: am
93f3fc87: Merge "add metrics to assistant" into mnc-dev
* commit '
8a38babb500d1b061fcf95b5d8e875bfca5c8c14':
add metrics to assistant
Benjamin Franz [Thu, 6 Aug 2015 19:32:43 +0000 (19:32 +0000)]
am
a17c5bac: am
dc89dafa: am
339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev
* commit '
a17c5bac6efff8365c1f2019311778413598e37c':
Use realActivity as indicator for task locking
Svetoslav Ganov [Thu, 6 Aug 2015 19:32:37 +0000 (19:32 +0000)]
am
cee66550: am
8695ec34: am
38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
* commit '
cee6655097d174f25fa21b6c2e80a3bbe54aae7e':
Pregrant unrevokable storage permission to the CertInstaller
Chris Wren [Thu, 6 Aug 2015 19:28:33 +0000 (19:28 +0000)]
am
062130d9: am
93f3fc87: Merge "add metrics to assistant" into mnc-dev
* commit '
062130d95d239d42a9ac3bd6211c70ca61cd3b89':
add metrics to assistant
Benjamin Franz [Thu, 6 Aug 2015 19:28:29 +0000 (19:28 +0000)]
am
dc89dafa: am
339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev
* commit '
dc89dafaa3d95fe88eaa82b888098ffe9f07e4f5':
Use realActivity as indicator for task locking
Jeff Sharkey [Thu, 6 Aug 2015 19:27:42 +0000 (19:27 +0000)]
Merge "Protect runtime storage mount points." into mnc-dev
Chris Wren [Thu, 6 Aug 2015 19:25:08 +0000 (19:25 +0000)]
am
93f3fc87: Merge "add metrics to assistant" into mnc-dev
* commit '
93f3fc876639cd23ff176cba2e1f8f08df6f3fb5':
add metrics to assistant
Svetoslav Ganov [Thu, 6 Aug 2015 19:23:08 +0000 (19:23 +0000)]
am
8695ec34: am
38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
* commit '
8695ec34cf0460ec7687b578475d71c4c09cb773':
Pregrant unrevokable storage permission to the CertInstaller
Paul Mclean [Thu, 6 Aug 2015 19:22:27 +0000 (19:22 +0000)]
am
5ccd64b4: am
80688be6: am
af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
* commit '
5ccd64b46e548dd7bc4d5252f640c0406e955e5c':
Consider channel index masks when calculating channel counts.
Paul Mclean [Thu, 6 Aug 2015 19:22:20 +0000 (19:22 +0000)]
am
4463053e: am
a154b332: am
c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
* commit '
4463053e79a39deaacef3035543df778d6ed3df1':
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Benjamin Franz [Thu, 6 Aug 2015 19:20:38 +0000 (19:20 +0000)]
am
339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev
* commit '
339a9bbf6d6544b516d6dbbae874d02f3ef7a6a4':
Use realActivity as indicator for task locking
Chris Wren [Thu, 6 Aug 2015 19:18:17 +0000 (19:18 +0000)]
Merge "add metrics to assistant" into mnc-dev
Benjamin Franz [Thu, 6 Aug 2015 19:15:29 +0000 (19:15 +0000)]
Merge "Use realActivity as indicator for task locking" into mnc-dev
Paul Mclean [Thu, 6 Aug 2015 19:14:14 +0000 (19:14 +0000)]
am
80688be6: am
af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
* commit '
80688be665c7cff4b53217422a0ec13b0c0272da':
Consider channel index masks when calculating channel counts.
Paul Mclean [Thu, 6 Aug 2015 19:14:10 +0000 (19:14 +0000)]
am
a154b332: am
c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
* commit '
a154b332ab2fdcb541079a2b7c23932371c1f69f':
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Svetoslav Ganov [Thu, 6 Aug 2015 19:12:25 +0000 (19:12 +0000)]
am
38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
* commit '
38c0fbda53399ac888e112d235e217fea220c2b7':
Pregrant unrevokable storage permission to the CertInstaller
Chris Wren [Thu, 6 Aug 2015 18:53:32 +0000 (14:53 -0400)]
add metrics to assistant
long press
screenshot enabled
context enabled
Bug:
22949579
Change-Id: Iac178207fa7149cda03c9a817a0d1450e46e1c59
Svetoslav Ganov [Thu, 6 Aug 2015 19:08:33 +0000 (19:08 +0000)]
Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
Paul Mclean [Thu, 6 Aug 2015 19:06:15 +0000 (19:06 +0000)]
am
af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
* commit '
af7748efb6cf4ecca07ab7a76b678a04387e2e40':
Consider channel index masks when calculating channel counts.
Paul Mclean [Thu, 6 Aug 2015 19:06:11 +0000 (19:06 +0000)]
am
c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
* commit '
c770b7a537350930dab6489c1e2a6f7e46dc47d1':
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Paul Mclean [Thu, 6 Aug 2015 18:59:06 +0000 (18:59 +0000)]
Merge "Consider channel index masks when calculating channel counts." into mnc-dev
Paul Mclean [Thu, 6 Aug 2015 18:58:33 +0000 (18:58 +0000)]
Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
Jeff Sharkey [Thu, 6 Aug 2015 18:40:21 +0000 (11:40 -0700)]
Protect runtime storage mount points.
We have a bunch of magic that mounts the correct view of storage
access based on the runtime permissions of an app, but we forgot to
protect the real underlying data sources; oops.
This series of changes just bumps the directory heirarchy one level
to give us /mnt/runtime which we can mask off as 0700 to prevent
people from jumping to the exposed internals.
Also add CTS tests to verify that we're protecting access to
internal mount points like this.
Bug:
22964288
Change-Id: I74dbdcb01d4fabe92166b8043a74c6a1e93c6d5f
Alan Viverette [Thu, 6 Aug 2015 18:12:24 +0000 (18:12 +0000)]
am
8a782c9d: am
db576e1d: am
c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '
8a782c9de46cd770a421e4523900584343c8a631':
Update anchor background on the correct view in PopupWindow
Alan Viverette [Thu, 6 Aug 2015 18:02:47 +0000 (18:02 +0000)]
am
db576e1d: am
c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '
db576e1d0cead619164afacefdb6215194285a32':
Update anchor background on the correct view in PopupWindow
Alan Viverette [Thu, 6 Aug 2015 17:55:38 +0000 (17:55 +0000)]
am
c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '
c7f8133fa1ff78fea5a54974b5987791cb012f84':
Update anchor background on the correct view in PopupWindow
Alan Viverette [Thu, 6 Aug 2015 17:48:22 +0000 (17:48 +0000)]
Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
Benjamin Franz [Thu, 6 Aug 2015 17:09:03 +0000 (18:09 +0100)]
Use realActivity as indicator for task locking
When lock task mode is started, we verify that the package is
whitelisted and currently use mCallingPackage as indicator. However,
the calling package is not necessarily identical to the package trying
to lock itself, so lock task mode sometimes fails. Switching over to
using realActivity as package marker.
Bug:
22916291
Change-Id: Ifd4df2d634842c8106b0b0f690bcf1faba0ed5fa
Dianne Hackborn [Thu, 6 Aug 2015 17:06:47 +0000 (17:06 +0000)]
am
41dfffb3: am
db6a6a21: am
6b0f1e78: Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '
41dfffb3578f5924923c5ed490285f5f3776c892':
Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult
Dianne Hackborn [Thu, 6 Aug 2015 17:00:47 +0000 (17:00 +0000)]
am
db6a6a21: am
6b0f1e78: Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '
db6a6a215e9f55b9413e18ca9c67aa3ef31bbefb':
Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult
Dianne Hackborn [Thu, 6 Aug 2015 16:53:56 +0000 (16:53 +0000)]
am
6b0f1e78: Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '
6b0f1e78b841a32b45f513d283202e3af90c6a73':
Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult
Dianne Hackborn [Thu, 6 Aug 2015 16:48:34 +0000 (16:48 +0000)]
Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
Chet Haase [Thu, 6 Aug 2015 16:44:32 +0000 (16:44 +0000)]
am
42c70645: am
aed2e8ba: am
da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit '
42c70645d28f07db145e02fd4a11af99c6437936':
Avoid changing internal state of shared drawable
Chet Haase [Thu, 6 Aug 2015 16:38:02 +0000 (16:38 +0000)]
am
aed2e8ba: am
da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit '
aed2e8baedd9cf3fb4472d4215dc9b15da390a94':
Avoid changing internal state of shared drawable
Alan Viverette [Thu, 6 Aug 2015 16:36:47 +0000 (12:36 -0400)]
Update anchor background on the correct view in PopupWindow
We were always setting the background of the decor view when the
"above anchor" state changed, rather than the background view.
Bug:
22970244
Change-Id: I3cd7202767ee47cb415736bb3c07369801abccd8
Chet Haase [Thu, 6 Aug 2015 16:29:33 +0000 (16:29 +0000)]
am
da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit '
da493aa6eab24de98b63cc63c457f5b899da3ad2':
Avoid changing internal state of shared drawable
Chet Haase [Thu, 6 Aug 2015 16:23:20 +0000 (16:23 +0000)]
Merge "Avoid changing internal state of shared drawable" into mnc-dev
Alan Treadway [Thu, 6 Aug 2015 16:06:40 +0000 (16:06 +0000)]
am
54f1ffcd: am
2d1cf627: am
190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '
54f1ffcdd69ebc63d5f0d02e963b9ee7f7277786':
Update documentation of DevicePolicyManager intents.
Paul McLean [Thu, 6 Aug 2015 15:35:55 +0000 (09:35 -0600)]
Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
Bug:
22792346
Change-Id: I8a10eb68368ede4baa0d2fd0d71cfff2fced4b75
Alan Treadway [Thu, 6 Aug 2015 15:59:43 +0000 (15:59 +0000)]
am
2d1cf627: am
190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '
2d1cf6278587224125da298aba42044aff1d5d8c':
Update documentation of DevicePolicyManager intents.
Alan Treadway [Thu, 6 Aug 2015 15:51:04 +0000 (15:51 +0000)]
am
190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '
190a88d2ce6a08d0eb98d774b81e5ca6b82b45f8':
Update documentation of DevicePolicyManager intents.
Alan Treadway [Thu, 6 Aug 2015 15:47:34 +0000 (15:47 +0000)]
Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
Alan Treadway [Tue, 28 Jul 2015 10:49:35 +0000 (11:49 +0100)]
Update documentation of DevicePolicyManager intents.
Add additional information about the intentions of result codes in
device-owner and profile-owner launch intents, in alignment with
changes made in http://ag/732321.
Bug:
21063241
Change-Id: I0e0a931739cee5f46e8fc7622fe1de49e26dcb0a
Chet Haase [Thu, 6 Aug 2015 04:44:42 +0000 (21:44 -0700)]
Avoid changing internal state of shared drawable
An optimization in ImageView nulled out the internal bitmap of a cached
internal BitmapDrawable object created to wrap a bitmap set on the ImageView.
However, apps can get ahold of that cached object via Drawable.getBitmap(),
resulting in having the state of that object they may be using changing out
from under them.
The change is to null out the cached object when getDrawable() is called, to avoid
leaking internal state that we may change.
That way, the app can continue to use that object if they want to, but we are no longer
relying on it internally, and will create a new one when needed.
Issue #
22930646 [1P Regression from L] ImageView is blanked out in Activity in Google Express
Change-Id: Ic86cb93be4897b6ba247c1fabcda507e4ba01300
Michael Wright [Thu, 6 Aug 2015 14:14:21 +0000 (14:14 +0000)]
am
b9bdde13: am
1663c75f: am
d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '
b9bdde13f50af73597e5b8a951da8698ee3f8fae':
Make the NullVibrator really null.
Michael Wright [Thu, 6 Aug 2015 14:14:15 +0000 (14:14 +0000)]
am
43a95cf1: am
44a14ef7: am
eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev
* commit '
43a95cf1cdf5cd62b81af3222d194a0873ad6933':
Don't dispatch when non-interactive and the display is off.
Michael Wright [Thu, 6 Aug 2015 14:05:21 +0000 (14:05 +0000)]
am
1663c75f: am
d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '
1663c75fa7e83547f3aefc6128f2b90776de5639':
Make the NullVibrator really null.
Michael Wright [Thu, 6 Aug 2015 14:05:17 +0000 (14:05 +0000)]
am
44a14ef7: am
eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev
* commit '
44a14ef7b4b5e85bb79c954f99929ec309c42c2e':
Don't dispatch when non-interactive and the display is off.
Julia Reynolds [Thu, 6 Aug 2015 14:01:40 +0000 (14:01 +0000)]
am
48d146c9: am
c694ab32: am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
48d146c9d66abd3002a8bc6b7245e4c34b6fcff5':
Store ringer mode on entering DND mode so it can be restored on exit.
Michael Wright [Thu, 6 Aug 2015 13:58:05 +0000 (13:58 +0000)]
am
d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '
d5a6df6d228036258d616245502c1a4f85ba4b2e':
Make the NullVibrator really null.
Michael Wright [Thu, 6 Aug 2015 13:58:01 +0000 (13:58 +0000)]
am
eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev
* commit '
eb7e3d7e456177f7848834759b9a7f6f78a05f7a':
Don't dispatch when non-interactive and the display is off.
Julia Reynolds [Thu, 6 Aug 2015 13:54:43 +0000 (13:54 +0000)]
am
c694ab32: am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
c694ab32846da54f7fc00dea42ded9b98c6f148f':
Store ringer mode on entering DND mode so it can be restored on exit.
Michael Wright [Thu, 6 Aug 2015 13:52:34 +0000 (13:52 +0000)]
Merge "Make the NullVibrator really null." into mnc-dev
Michael Wright [Thu, 6 Aug 2015 13:50:37 +0000 (13:50 +0000)]
Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev
Julia Reynolds [Thu, 6 Aug 2015 13:48:41 +0000 (13:48 +0000)]
am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
a3b5a61271bde79ef1072b13ed14525ce53bf62b':
Store ringer mode on entering DND mode so it can be restored on exit.
Julia Reynolds [Thu, 6 Aug 2015 13:41:01 +0000 (13:41 +0000)]
Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
Geoff Mendal [Thu, 6 Aug 2015 04:36:41 +0000 (04:36 +0000)]
am
511cf5b8: (-s ours) am
227d704f: (-s ours) am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
511cf5b88230910bac312f160e289650da896253':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:29:54 +0000 (04:29 +0000)]
am
227d704f: (-s ours) am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
227d704f64cb7783b8626770ddbbfb151c843f99':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:37 +0000 (04:20 +0000)]
am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
375c792c176be43720da47db2cfced23613f537c':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:12:38 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Mitchell Wills [Thu, 6 Aug 2015 02:45:46 +0000 (02:45 +0000)]
am
e69acd7a: am
104999b9: am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
e69acd7a456fb97d7c816629dedb42026eabdd2e':
Pass connection configuration when setting wifi info
Amit Mahajan [Thu, 6 Aug 2015 02:40:05 +0000 (02:40 +0000)]
am
e992c927: am
89718b2b: am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
e992c927ebba4bed96f86388f1601e3cc3c7c9e3':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Jim Miller [Thu, 6 Aug 2015 02:40:00 +0000 (02:40 +0000)]
am
5f96eb0c: am
6fdb85d3: am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
5f96eb0caf6db51751b2af6404c98037067ce29d':
Disable fingerprint when remotely reset by DPM
Yorke Lee [Thu, 6 Aug 2015 02:39:54 +0000 (02:39 +0000)]
am
7be1e286: am
cac65feb: am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
7be1e2864136e87ad473f35e54a6795c4a58df8d':
Correctly hide setConnectionService
Deepanshu Gupta [Thu, 6 Aug 2015 02:39:48 +0000 (02:39 +0000)]
am
0e0d254c: am
c34288be: am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
0e0d254c4ae1a744ebec1af70c11777d4d2f4525':
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Mitchell Wills [Thu, 6 Aug 2015 02:37:19 +0000 (02:37 +0000)]
am
104999b9: am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
104999b957440251610dc31939938ef0c85ab23f':
Pass connection configuration when setting wifi info
Mitchell Wills [Thu, 6 Aug 2015 02:29:19 +0000 (02:29 +0000)]
am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
d14c48444a40fa2f964461e2f1317bcc3e256295':
Pass connection configuration when setting wifi info
Mitchell Wills [Thu, 6 Aug 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Pass connection configuration when setting wifi info" into mnc-dev
Svetoslav [Thu, 6 Aug 2015 02:14:47 +0000 (19:14 -0700)]
Pregrant unrevokable storage permission to the CertInstaller
bug:
22988119
Change-Id: I310aa7149f67a7918cecfda13c69ab91c7c6e1a8
Amit Mahajan [Thu, 6 Aug 2015 01:57:58 +0000 (01:57 +0000)]
am
89718b2b: am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
89718b2bf8f0449b122bf1c8aba039c6a0575c21':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Jim Miller [Thu, 6 Aug 2015 01:57:54 +0000 (01:57 +0000)]
am
6fdb85d3: am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
6fdb85d383007e7d68895195d6347840276abeab':
Disable fingerprint when remotely reset by DPM
Yorke Lee [Thu, 6 Aug 2015 01:57:49 +0000 (01:57 +0000)]
am
cac65feb: am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
cac65febb7bf50f0bc03d897ebbafa8347c0de31':
Correctly hide setConnectionService
Deepanshu Gupta [Thu, 6 Aug 2015 01:57:46 +0000 (01:57 +0000)]
am
c34288be: am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
c34288be586028f949686e9a4fe7b84207bf2a6d':
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Amit Mahajan [Thu, 6 Aug 2015 01:43:18 +0000 (01:43 +0000)]
am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
be948f5a9f519210c5522060ec9ee3bc77eb077e':
Removing tethering overlay for mcc202-mnc05 (VF Greece).
Jim Miller [Thu, 6 Aug 2015 01:43:13 +0000 (01:43 +0000)]
am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
120fc2c74eb290e06cddf1b52d363338f940c612':
Disable fingerprint when remotely reset by DPM
Yorke Lee [Thu, 6 Aug 2015 01:43:05 +0000 (01:43 +0000)]
am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
f0affc6d46849e844bec9ddc755ffae0042e443f':
Correctly hide setConnectionService
Deepanshu Gupta [Thu, 6 Aug 2015 01:42:43 +0000 (01:42 +0000)]
am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
2c1a22d91607e18c7618e79ab026d3c5c4ce8949':
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Geoff Mendal [Thu, 6 Aug 2015 00:54:19 +0000 (17:54 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
22842106
Change-Id: I473bc0dc200e1eec3bd0f907526fcf808ee86e36
Tim Murray [Wed, 5 Aug 2015 23:26:16 +0000 (23:26 +0000)]
am
ffd8889a: am
f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev
* commit '
ffd8889a96db0dadf01f6dfcd9393910d491fb91':
Add boost to increase the load on newly-forked zygote processes.
Tim Murray [Wed, 5 Aug 2015 23:20:45 +0000 (23:20 +0000)]
am
f76806a9: Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev
* commit '
f76806a9c0ddc8dd234ff746a52b74b19e7c2c12':
Add boost to increase the load on newly-forked zygote processes.
Tim Murray [Wed, 5 Aug 2015 23:10:50 +0000 (23:10 +0000)]
Merge "Add boost to increase the load on newly-forked zygote processes." into mnc-dr-dev
Amit Mahajan [Wed, 5 Aug 2015 23:09:58 +0000 (23:09 +0000)]
Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
Jim Miller [Wed, 5 Aug 2015 22:47:57 +0000 (22:47 +0000)]
Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
Mitchell Wills [Mon, 3 Aug 2015 16:46:08 +0000 (09:46 -0700)]
Pass connection configuration when setting wifi info
This allows the both the ssid and connection info to be verified when
updating wifi info.
Bug:
22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812
Yorke Lee [Wed, 5 Aug 2015 22:13:07 +0000 (22:13 +0000)]
Merge "Correctly hide setConnectionService" into mnc-dev
Dianne Hackborn [Wed, 5 Aug 2015 22:01:28 +0000 (15:01 -0700)]
Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult
Add new Activity callback to tell it when its saved state has
been invalidated.
The problem is that delivering the permission result does not go
through a path where the compatibility code can see it first to
mark its fragment manager as no longer having saved state. So this
new callback gives it a place to do that.
Change-Id: I5a4a185d9c746bae1afb5c588aba82c8daccf079
Tim Murray [Wed, 5 Aug 2015 21:31:05 +0000 (14:31 -0700)]
Add boost to increase the load on newly-forked zygote processes.
Makes it more likely for app launches to end up on a large core in
an HMP environment.
bug
21915482
Change-Id: Ieac192a4bc1237dd03b9492fcad3a78de5510a58
Deepanshu Gupta [Wed, 5 Aug 2015 21:11:40 +0000 (21:11 +0000)]
Merge changes I85106f37,I7db398aa into mnc-dev
* changes:
Make getInt in BridgeTypedArray accept empty String.
Fix layout mirroring.
Paul Mclean [Wed, 5 Aug 2015 21:10:37 +0000 (21:10 +0000)]
am
eda52f0a: am
4d1128b2: am
8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '
eda52f0a8e08d100daadddc4c875ebd7d25fa72f':
Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
Paul Mclean [Wed, 5 Aug 2015 21:06:33 +0000 (21:06 +0000)]
am
4d1128b2: am
8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '
4d1128b2b97ab1b6cc711437a5bb5e4a86de6735':
Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
Paul Mclean [Wed, 5 Aug 2015 20:58:35 +0000 (20:58 +0000)]
am
8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '
8eaf18b0ab77184f16870428258650bd12bb2ea5':
Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices.
Paul Mclean [Wed, 5 Aug 2015 20:50:29 +0000 (20:50 +0000)]
Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
Phil Burk [Wed, 5 Aug 2015 20:09:49 +0000 (20:09 +0000)]
am
65b33c92: am
7cc0cda1: am
881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
* commit '
65b33c92acc0381acaed5de532bdc7c3e44c6bd5':
MidiManager: use ConcurrentHashMap
Jim Miller [Wed, 5 Aug 2015 20:03:21 +0000 (13:03 -0700)]
Disable fingerprint when remotely reset by DPM
When the device is lost or stolen, it's safer to
fall back to strong authentication (pin, pattern or
password). This disables fingerprint like we do with
trust agents.
Fixes bug
21620081
Change-Id: I7bbe54be3721b2f160b783daeb3acbe434705046
Paul McLean [Fri, 31 Jul 2015 15:28:22 +0000 (09:28 -0600)]
Documenting behavior of returning a 0-length array for formats,
channels, rates queries for analog devices.
Bug:
22729461
Change-Id: I3cb1d586f6264e3627cbb0261a3b2c74ca51cf6b
Phil Burk [Wed, 5 Aug 2015 20:03:17 +0000 (20:03 +0000)]
am
7cc0cda1: am
881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
* commit '
7cc0cda18e5e5bd235041fa2589999c6d4109127':
MidiManager: use ConcurrentHashMap
Vladislav Kaznacheev [Wed, 5 Aug 2015 19:57:30 +0000 (19:57 +0000)]
am
c3213285: am
072097bd: am
8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
* commit '
c32132853f9eaf62ec59fa375a288b957c50e53a':
Keep OverScroller.SplineOverScroller state consistent.
OSDN Git Service
