OSDN Git Service
Mark Lu [Mon, 19 Dec 2016 20:21:26 +0000 (20:21 +0000)]
docs: update Paint.setTextSize() to indicate pixel units am:
5f05256106
am:
9c834b1241
Change-Id: I6ab667b17df3101370ed57f30ab273077a27c346
Mark Lu [Mon, 19 Dec 2016 20:16:15 +0000 (20:16 +0000)]
docs: update Paint.setTextSize() to indicate pixel units
am:
5f05256106
Change-Id: I9709ea36fe7657c8a06abe1c58760b30112e0e63
Charles Mendis [Mon, 19 Dec 2016 19:11:52 +0000 (19:11 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
am:
a586b546c3
Change-Id: Ib994cff58777ab8b33a0f1bf79d6bf4128556344
Michael Kwan [Mon, 19 Dec 2016 19:11:48 +0000 (19:11 +0000)]
Fix OnCancelListener for Dialogs on swipe to dismiss.
am:
67639a5f67
Change-Id: I92bc472b3519020eeadf61b1e8047aee9e8bd96c
Charles Mendis [Mon, 19 Dec 2016 19:05:49 +0000 (19:05 +0000)]
Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev
Michael Rosenfeld [Sun, 18 Dec 2016 00:21:19 +0000 (00:21 +0000)]
Merge "Clean up local hprofs" am:
9ab94e15c7
am:
1876d82450
Change-Id: I16c2e27c21d933e6090adb48af144c731a2c8ac6
Marie Janssen [Sun, 18 Dec 2016 00:20:18 +0000 (00:20 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash" am:
e2c22e38d5
am:
ff0d3e1c8d -s ours
Change-Id: I5e891c190c1c86d33176f83a2e92ce807af45472
Mark Lu [Fri, 16 Dec 2016 22:23:47 +0000 (14:23 -0800)]
docs: update Paint.setTextSize() to indicate pixel units
bug:
2321154
Change-Id: Ic71404677a8079c744b99d4848d69c6ff52089ab
Joe Fernandez [Sat, 17 Dec 2016 04:59:05 +0000 (04:59 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38
am:
536dc4ecc4
Change-Id: I00433f2c53c4ae494082ce21a4edb63717347906
Joe Fernandez [Sat, 17 Dec 2016 04:48:04 +0000 (04:48 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a
am:
e161f75d38
Change-Id: I622c23e61f4e8db5a51a9d2425cc1fe379ec9505
Joe Fernandez [Sat, 17 Dec 2016 04:37:05 +0000 (04:37 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e
am:
045ae0458a
Change-Id: I2257467a9b263897d2af594720de61d29a982709
Joe Fernandez [Sat, 17 Dec 2016 04:26:02 +0000 (04:26 +0000)]
docs: Add deprecation message for the developer.android.com docs
am:
b9bd6cca9e
Change-Id: I3ba7d4519c491bdf09836f096106b4a6bc52e116
Svet Ganov [Sat, 17 Dec 2016 03:54:05 +0000 (03:54 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3
am:
0dca3a2fba
Change-Id: Ifd62443464dfa77b022552a1fada1288cfd42afe
Svet Ganov [Sat, 17 Dec 2016 03:42:58 +0000 (03:42 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753
am:
5034efbaf3
Change-Id: I22c38f921047ba7ecea5826701e3024de9a3d110
Svet Ganov [Sat, 17 Dec 2016 03:32:01 +0000 (03:32 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours
am:
c91845f753
Change-Id: Ia85d2855dd8360b94fecb4bf6cd280ea4518d0e1
Svet Ganov [Sat, 17 Dec 2016 03:21:28 +0000 (03:21 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
am:
c3db570a00 -s ours
Change-Id: I63b03cd2b057f95aefab23cdb4a29766ec304544
Mark Lu [Sat, 17 Dec 2016 02:29:43 +0000 (02:29 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739
am:
1474527789
Change-Id: I9ec8192fcf3bf3fa180e471648894d6b2e51abc9
Mark Lu [Sat, 17 Dec 2016 02:28:31 +0000 (02:28 +0000)]
docs: update description for BitmapFactory.Options#inBitmap am:
a8f4286272
am:
58d24b22ed
Change-Id: I0420f0eba2d7d99b0c19aad72082b53dca3ac00e
Joe Fernandez [Sat, 17 Dec 2016 02:20:56 +0000 (18:20 -0800)]
docs: Add deprecation message for the developer.android.com docs
Change-Id: Ia091df49099482696abbc3a596cf1787ca904d67
Mark Lu [Sat, 17 Dec 2016 02:19:55 +0000 (02:19 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
am:
88e64bb739
Change-Id: Idcaf2dabd54d5fc07cce825e44237ddb3fc0e51f
Mark Lu [Sat, 17 Dec 2016 02:19:51 +0000 (02:19 +0000)]
docs: update description for BitmapFactory.Options#inBitmap
am:
a8f4286272
Change-Id: I163f1f5f8a9d688407aa7c0d76895bf18efa3430
Michael Rosenfeld [Sat, 17 Dec 2016 02:10:53 +0000 (02:10 +0000)]
Merge "Clean up local hprofs"
am:
9ab94e15c7
Change-Id: Ie99cc29ef321ec7276535b28ae4b7eaf828410da
Mark Lu [Sat, 17 Dec 2016 02:04:23 +0000 (02:04 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
Treehugger Robot [Sat, 17 Dec 2016 01:54:34 +0000 (01:54 +0000)]
Merge "Clean up local hprofs"
Michael Rosenfeld [Fri, 16 Dec 2016 20:42:01 +0000 (12:42 -0800)]
Clean up local hprofs
* After use
* Upon failure
Test: manual tool use
Change-Id: I2669e190c3792522c121158ea2aec84fe577c9e3
Philip P. Moltmann [Sat, 17 Dec 2016 00:03:28 +0000 (00:03 +0000)]
Merge "Increment vers of PrintRecommendationService" am:
08bff42ef4
am:
a791fee2bc
Change-Id: I2a39d30b3627872d996786b276430982eba92b60
Vitalii Tomkiv [Sat, 17 Dec 2016 00:01:23 +0000 (00:01 +0000)]
Merge changes Ic85892b4,I627e47c6 am:
d995c94426
am:
d49df21f80
Change-Id: Ia916b1a329769a22bf3831dec03c753018c2e24c
Vitalii Tomkiv [Sat, 17 Dec 2016 00:00:34 +0000 (00:00 +0000)]
Make sure Zygote is running at process priority 0 after VM has started. am:
1e52ce48a6
am:
7f797cc54c
Change-Id: Ic5f00cb15b996317fdf6ac8aa4053c79426f1e23
Todd Kjos [Fri, 16 Dec 2016 23:59:45 +0000 (23:59 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes." am:
8175f0955a
am:
501875bbe8 -s ours
Change-Id: Iaa49788db807d3d1965e6e85e10f6659e760146e
Mark Lu [Fri, 16 Dec 2016 23:43:27 +0000 (15:43 -0800)]
docs: update description for BitmapFactory.Options#inBitmap
bug:
18730109
Change-Id: Iab062d41af3a32208d3500179d3737278a035188
Marie Janssen [Fri, 16 Dec 2016 23:07:42 +0000 (23:07 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash"
am:
e2c22e38d5
Change-Id: I6722c1b8d839918e2ce7918f5f7b8583a14c1ded
Marie Janssen [Fri, 16 Dec 2016 22:56:58 +0000 (22:56 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash"
Philip P. Moltmann [Fri, 16 Dec 2016 22:51:11 +0000 (22:51 +0000)]
Merge "Increment vers of PrintRecommendationService"
am:
08bff42ef4
Change-Id: Ie98d6f58dbb4d29e27200aa1b9829372930a0fa3
Marie Janssen [Thu, 15 Dec 2016 21:51:30 +0000 (13:51 -0800)]
Bluetooth: fix issues re-enabling after crash
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance. In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.
Luckily in this case the persisted system state is also ON. Use the
persisted state as information about whether we should be fully enabled.
Test: basic sanity check, forced crash of BT
Bug:
33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
Philip P. Moltmann [Fri, 16 Dec 2016 22:36:10 +0000 (22:36 +0000)]
Merge "Increment vers of PrintRecommendationService"
Vitalii Tomkiv [Fri, 16 Dec 2016 22:35:54 +0000 (22:35 +0000)]
Merge changes Ic85892b4,I627e47c6
am:
d995c94426
Change-Id: If036b0f5b8497667a9c2a916ec74d482def2aed5
Vitalii Tomkiv [Fri, 16 Dec 2016 22:35:49 +0000 (22:35 +0000)]
Make sure Zygote is running at process priority 0 after VM has started.
am:
1e52ce48a6
Change-Id: Ia1f511d294a9c718534a4a0b8ad747ef58a98b52
Todd Kjos [Fri, 16 Dec 2016 22:35:08 +0000 (22:35 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes."
am:
8175f0955a
Change-Id: I6f61c45f690647c860e0ceb140857e53bc253f00
Treehugger Robot [Fri, 16 Dec 2016 22:20:24 +0000 (22:20 +0000)]
Merge changes Ic85892b4,I627e47c6
* changes:
Make sure Zygote is running at process priority 0 after VM has started.
Revert "Add boost to increase the load on newly-forked zygote processes."
Torne (Richard Coles) [Fri, 16 Dec 2016 21:45:40 +0000 (21:45 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist." am:
f8882ae834
am:
bc801c663e
Change-Id: If1edf0bf30e8359912235c788a49131b528efb30
Michael Kwan [Fri, 16 Dec 2016 20:38:10 +0000 (12:38 -0800)]
Fix OnCancelListener for Dialogs on swipe to dismiss.
Swipe to dismiss on dialogs did not dispatch onCancel events
to OnCancelListeners. Resolve by adding listener to monitor
swipe to dismiss events and dispatch onCancel events when
that occurs.
Bug:
33663411
Change-Id: I64ff29e008d485a4559eb3d1ff7f0e74dccff404
Torne (Richard Coles) [Fri, 16 Dec 2016 21:38:17 +0000 (21:38 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist."
am:
f8882ae834
Change-Id: I02d08d8f91567b8bd6709137f98f87550c13f145
Treehugger Robot [Fri, 16 Dec 2016 21:25:34 +0000 (21:25 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist."
TreeHugger Robot [Fri, 16 Dec 2016 21:02:57 +0000 (21:02 +0000)]
Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp
* changes:
Revert "Add boost to increase the load on newly-forked zygote processes."
Make sure Zygote is running at process priority 0 after VM has started.
Philip P. Moltmann [Fri, 16 Dec 2016 20:51:49 +0000 (12:51 -0800)]
Increment vers of PrintRecommendationService
as the Samsung PlugIn was updated.
Test: Let the service generate some recommendations
Change-Id: Ief7ea4f1dddfee92aa9fa83ff53b296ced0e3b55
Joe LaPenna [Fri, 16 Dec 2016 20:44:05 +0000 (20:44 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service." am:
0b4df21aac
am:
4c3b2f5f99
Change-Id: I7ee10f1336c48969fa64cd6f5a45087027a2e8c3
Joe LaPenna [Fri, 16 Dec 2016 20:35:53 +0000 (20:35 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service."
am:
0b4df21aac
Change-Id: Ia955fd0d980a5ddcdb5ae6880c7a380251819f44
Treehugger Robot [Fri, 16 Dec 2016 20:23:47 +0000 (20:23 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service."
Andreas Gampe [Fri, 16 Dec 2016 19:47:42 +0000 (19:47 +0000)]
Merge changes Ia4bec085,I59095f2a am:
733d007279
am:
3d17e17b0a
Change-Id: I835f1efcf985c73db9ddb5ffe15d80842afdf6e2
Tamas Berghammer [Fri, 16 Dec 2016 19:46:55 +0000 (19:46 +0000)]
Enable logwrapper functionality on user builds am:
0ca16fa584
am:
db05d4b4ed
Change-Id: Ic6c3395f9965657a7f9abe580867eeb81b59ed88
Tamas Berghammer [Fri, 16 Dec 2016 19:46:03 +0000 (19:46 +0000)]
Zygote: Add invoke-with to zygote protocol am:
b8f7c351b9
am:
45c2fffc52
Change-Id: I90999d84c9694bfeebea8d2c2d95d1d545bac7e8
Andreas Gampe [Fri, 16 Dec 2016 19:38:43 +0000 (19:38 +0000)]
Merge changes Ia4bec085,I59095f2a
am:
733d007279
Change-Id: Id0f0746af66b4f2e0352e2a0dde9d3f27e23f84c
Tamas Berghammer [Fri, 16 Dec 2016 19:38:38 +0000 (19:38 +0000)]
Enable logwrapper functionality on user builds
am:
0ca16fa584
Change-Id: Ic18991f9a59f05356fcbcc65acc79be43fc68542
Tamas Berghammer [Fri, 16 Dec 2016 19:37:57 +0000 (19:37 +0000)]
Zygote: Add invoke-with to zygote protocol
am:
b8f7c351b9
Change-Id: I79db6f759b02ef612364fc857102615d51900cd9
Todd Kjos [Wed, 7 Sep 2016 01:25:46 +0000 (18:25 -0700)]
Revert "Add boost to increase the load on newly-forked zygote processes."
This reverts commit
6d43a861d01ef48f37c69f96346a13d23164a585.
(cherry picked from commit
0f2ded62ae3d88ddb732df182c3bfee3e2729018)
Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7
Andreas Gampe [Fri, 16 Dec 2016 19:24:12 +0000 (19:24 +0000)]
Merge changes Ia4bec085,I59095f2a
* changes:
Enable logwrapper functionality on user builds
Zygote: Add invoke-with to zygote protocol
Vitalii Tomkiv [Thu, 19 May 2016 00:43:02 +0000 (17:43 -0700)]
Make sure Zygote is running at process priority 0 after VM has started.
Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.
(cherry picked from commit
5d551a5ac3d13706f62a86842ff6851e1d25213b)
Bug:
28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478
Torne (Richard Coles) [Fri, 23 Sep 2016 15:41:42 +0000 (16:41 +0100)]
Add the webview zygote socket to the zygote whitelist.
Allow the webview zygote socket to be open at time of fork, so that
webview renderers can be forked successfully.
(cherry picked from commit
a7fcb2bc2a65da3743914727adb0df89a4eb0b66)
Test: WebView functions correctly with multiprocess dev setting enabled
Bug:
21643067
Change-Id: I312846433a43a8e4548cb2f98b96b56acf9f5333
Andreas Gampe [Fri, 16 Dec 2016 18:53:01 +0000 (18:53 +0000)]
Merge "NativeLibraryHelper: Minor fixes" am:
c1536f0d10
am:
109a82d7e3
Change-Id: I362df209d24a9e2602da1b8cf72e4ea63b5e7f60
Andreas Gampe [Fri, 16 Dec 2016 18:44:54 +0000 (18:44 +0000)]
Merge "NativeLibraryHelper: Minor fixes"
am:
c1536f0d10
Change-Id: I81e69315c5f74341ddf3472263462f8fdf935797
Joe LaPenna [Thu, 8 Dec 2016 00:32:51 +0000 (16:32 -0800)]
Set com.android.networkrecommendation as the default network recommendation service.
BUG:
33224286
Test: Build image and verified the config value was set.
Change-Id: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
Merged-In: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
Treehugger Robot [Fri, 16 Dec 2016 18:31:25 +0000 (18:31 +0000)]
Merge "NativeLibraryHelper: Minor fixes"
Vitalii Tomkiv [Thu, 19 May 2016 00:43:02 +0000 (17:43 -0700)]
Make sure Zygote is running at process priority 0 after VM has started.
Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.
(cherry picked from commit
5d551a5ac3d13706f62a86842ff6851e1d25213b)
Bug:
28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478
Todd Kjos [Wed, 7 Sep 2016 01:25:46 +0000 (18:25 -0700)]
Revert "Add boost to increase the load on newly-forked zygote processes."
This reverts commit
6d43a861d01ef48f37c69f96346a13d23164a585.
(cherry picked from commit
0f2ded62ae3d88ddb732df182c3bfee3e2729018)
Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7
Tamas Berghammer [Fri, 11 Nov 2016 16:08:26 +0000 (16:08 +0000)]
Enable logwrapper functionality on user builds
When an app is debuggable, check whether a script called "wrap.sh" exists
in the app's native library directory. If so, start the app using the
invoke-with functionality over the script. Weaken the invoke-with check
on the zygote side to allow the functionality for debuggable apps.
The goal of the functionality is to make malloc debug, strace and other
similar tools available for NDK based application developers.
Bug:
33668201
Test: manual - debug malloc can be enabled using the new feature
Change-Id: Ia4bec0854cf4dc08446f1671494200f54ef366ee
Tamas Berghammer [Fri, 11 Nov 2016 16:08:26 +0000 (16:08 +0000)]
Zygote: Add invoke-with to zygote protocol
Add "--invoke-with" to the zygote connection protocol. It was
already understood as an argument by the zygote.
Bug:
33668201
Test: m
Change-Id: I59095f2ac542aadff78a7ff1dded86cf5f192707
Andreas Gampe [Fri, 16 Dec 2016 00:12:39 +0000 (16:12 -0800)]
NativeLibraryHelper: Minor fixes
Skip over directories when iterating library files. Ensure correct
temp file naming.
Bug:
33668201
Test: m
Test: Device boots
Test: Manual: Install debuggable and non-debuggable apps
Change-Id: I2f0547e965d9a0c478e333a13b2db02f4eedac2c
Polina Bondarenko [Fri, 16 Dec 2016 10:45:03 +0000 (10:45 +0000)]
Merge "Make TelephonyManager APIs public:" am:
441bfc6718
am:
104a5c7a34
Change-Id: I0d234fd2539a3a9ec58c820a7a7428430aa2255a
Polina Bondarenko [Fri, 16 Dec 2016 10:37:21 +0000 (10:37 +0000)]
Merge "Make TelephonyManager APIs public:"
am:
441bfc6718
Change-Id: I968c8232c746027123beac6481161019e1dc64a5
Treehugger Robot [Fri, 16 Dec 2016 10:29:03 +0000 (10:29 +0000)]
Merge "Make TelephonyManager APIs public:"
Colin Cross [Fri, 16 Dec 2016 09:06:49 +0000 (09:06 +0000)]
Merge "Move libandroid_runtime headers into frameworks/base/core/jni" am:
541845908c
am:
29d7284285
Change-Id: Iedd8583e553fa5046a5434a56c0cf1e2a81851a7
Colin Cross [Fri, 16 Dec 2016 09:05:54 +0000 (09:05 +0000)]
Move libandroid_runtime headers into frameworks/base/core/jni am:
71044fe7e5
am:
7f63febbc4
Change-Id: I81b1c89c85ff779509309a83efc16dc140f4a08f
Colin Cross [Fri, 16 Dec 2016 08:57:55 +0000 (08:57 +0000)]
Merge "Move libandroid_runtime headers into frameworks/base/core/jni"
am:
541845908c
Change-Id: Ia15d168a42bd0290e7cdeb7d19c98210890ed095
Colin Cross [Fri, 16 Dec 2016 08:57:51 +0000 (08:57 +0000)]
Move libandroid_runtime headers into frameworks/base/core/jni
am:
71044fe7e5
Change-Id: I70e7c0ca02a2783ab2c32a9d067ba75092fd81c6
Treehugger Robot [Fri, 16 Dec 2016 08:46:58 +0000 (08:46 +0000)]
Merge "Move libandroid_runtime headers into frameworks/base/core/jni"
Mark Lu [Fri, 16 Dec 2016 05:07:35 +0000 (05:07 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev am:
7b22d549d4
am:
b825c71446
Change-Id: I08459d58e96cffebedb1fbe034c4c36acec1c0c0
Mark Lu [Fri, 16 Dec 2016 05:06:42 +0000 (05:06 +0000)]
docs: changes to broadcast documentation am:
33ec106d22
am:
377dab8ab3
Change-Id: I2e8377b188ce6a10ea633e089c3a20f9ef7908fd
Mark Lu [Fri, 16 Dec 2016 04:59:10 +0000 (04:59 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
am:
7b22d549d4
Change-Id: I41ac74d65f48258c21afcbd39bf1eb518976a5f2
Mark Lu [Fri, 16 Dec 2016 04:59:08 +0000 (04:59 +0000)]
docs: changes to broadcast documentation
am:
33ec106d22
Change-Id: I673efc100756ee6d6ef0d2afa99d48d471ce0987
Mark Lu [Fri, 16 Dec 2016 04:48:36 +0000 (04:48 +0000)]
Merge "docs: changes to broadcast documentation" into nyc-mr1-dev
Tamas Berghammer [Fri, 16 Dec 2016 01:21:31 +0000 (01:21 +0000)]
Merge "Install all files from the lib directory for debuggable apps" am:
c0cc7c646c
am:
736852e2c4
Change-Id: I0faa3ab541ca8d1400719653171b4bcafceada81
Adrian Roos [Fri, 16 Dec 2016 01:20:12 +0000 (01:20 +0000)]
Merge "Assist app is not launched when long-pressing on Home key" am:
1e41bb4887
am:
d81fde40ef
Change-Id: Ia8f58cfa1945a7ad627889545a264c9d1fb06beb
Tamas Berghammer [Fri, 16 Dec 2016 00:48:21 +0000 (00:48 +0000)]
Merge "Install all files from the lib directory for debuggable apps"
am:
c0cc7c646c
Change-Id: Idc3b17fa4044ab0dd50fa141f1ec5ec8a47810b0
Treehugger Robot [Fri, 16 Dec 2016 00:35:54 +0000 (00:35 +0000)]
Merge "Install all files from the lib directory for debuggable apps"
Adrian Roos [Fri, 16 Dec 2016 00:01:24 +0000 (00:01 +0000)]
Merge "Assist app is not launched when long-pressing on Home key"
am:
1e41bb4887
Change-Id: I3d88e9116c45cec013c4b7a3bb3f53480f0f2af6
Adrian Roos [Thu, 15 Dec 2016 23:51:11 +0000 (23:51 +0000)]
Merge "Assist app is not launched when long-pressing on Home key"
Shinji Sogo [Thu, 15 Dec 2016 23:04:21 +0000 (23:04 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID" am:
69e7f9683d
am:
e67395a97a
Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723
Svet Ganov [Thu, 15 Dec 2016 22:51:17 +0000 (14:51 -0800)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
bug:
33039926
bug:
33042690
Change-Id: If0431b77ec546c72f8cc25bb605a851572bb22a6
Shinji Sogo [Thu, 15 Dec 2016 22:32:03 +0000 (22:32 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
am:
69e7f9683d
Change-Id: I7ce35b895d24b013169aa30b794fb524bac09990
Treehugger Robot [Thu, 15 Dec 2016 22:17:47 +0000 (22:17 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
Michael Kwan [Thu, 15 Dec 2016 21:16:19 +0000 (21:16 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am:
738fb65657
Change-Id: Ica017f0a0490c522777f20e38b7db16872ccc615
Michael Kwan [Thu, 15 Dec 2016 21:16:15 +0000 (21:16 +0000)]
Fix swipe-to-dismiss to properly react to swipe gestures.
am:
8a9b27773b
Change-Id: If7040c0f1cc71edcc16021b4825fb5d1d6fbdecf
Michael Kwan [Thu, 15 Dec 2016 21:09:53 +0000 (21:09 +0000)]
Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
Martijn Coenen [Thu, 15 Dec 2016 20:47:05 +0000 (20:47 +0000)]
Merge "HwBinder: Remove use of IHw class." am:
11ec22ab2a
am:
df296fe1fa
Change-Id: I1c1069b5d2c1452f1cc9ee33725c3fa8f541966c
dcashman [Thu, 15 Dec 2016 20:45:55 +0000 (20:45 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components." am:
a1c9c860a9
am:
455202b9db
Change-Id: I2a314f827db34cc92058729629d9000526b43027
dcashman [Thu, 15 Dec 2016 20:41:14 +0000 (20:41 +0000)]
Split mac_permissions.xml into plat and non-plat components. am:
b1cc4f8ca4
am:
2a7ce100b7
Change-Id: I9d0e0f824fdc26c64d41f97b370f7483b63b97c5
Martijn Coenen [Thu, 15 Dec 2016 20:38:07 +0000 (20:38 +0000)]
Merge "HwBinder: Remove use of IHw class."
am:
11ec22ab2a
Change-Id: Icbeb3bb7548b00c5e28f689c761a4de425e1bd74
dcashman [Thu, 15 Dec 2016 20:32:54 +0000 (20:32 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
am:
a1c9c860a9
Change-Id: I11397c898e5cf7b0dd4a300646b409d28eb00b59
Martijn Coenen [Thu, 15 Dec 2016 20:28:48 +0000 (20:28 +0000)]
Merge "HwBinder: Remove use of IHw class."
dcashman [Thu, 15 Dec 2016 20:27:27 +0000 (20:27 +0000)]
Split mac_permissions.xml into plat and non-plat components.
am:
b1cc4f8ca4
Change-Id: I4c3d3a9c088c4cfc75f5503966390030e1375305
OSDN Git Service
