OSDN Git Service
Rebecca Silberstein [Tue, 20 Sep 2016 15:58:17 +0000 (15:58 +0000)]
Merge "WifiScanner: retrieve single scan results"
am:
3c70a2fad2
Change-Id: I0db176ca82665c8b8089a5110074d5f1edf3738d
Rebecca Silberstein [Tue, 20 Sep 2016 15:50:07 +0000 (15:50 +0000)]
Merge "WifiScanner: retrieve single scan results"
Etan Cohen [Mon, 19 Sep 2016 22:28:57 +0000 (22:28 +0000)]
Merge "[NAN] Update API: replace looper with handler"
am:
0027ddf990
Change-Id: I6d3934255c9c6e8085830eeab527479b292bac07
Etan Cohen [Mon, 19 Sep 2016 20:47:36 +0000 (20:47 +0000)]
Merge "[NAN] Update API: replace looper with handler"
Etan Cohen [Fri, 9 Sep 2016 20:36:52 +0000 (13:36 -0700)]
[NAN] Update API: replace looper with handler
Per API council guidelines.
(cherry-pick of commit
0ff5bf0092eb25f579e2e93fb2f93bc953b39211)
Bug:
31377060
Test: unit tests, integrated (sl4a) tests
Change-Id: I05142001fb593399fb4675fbec965d7e08e0fac1
Cuihtlauac ALVARADO [Mon, 19 Sep 2016 20:26:56 +0000 (20:26 +0000)]
Merge "Fix parameter description"
am:
750b523aa2
Change-Id: I5edb7e6910b92d3c2f93a61fc9e68489ece8e72f
Treehugger Robot [Mon, 19 Sep 2016 20:02:27 +0000 (20:02 +0000)]
Merge "Fix parameter description"
yuanhuihui [Mon, 19 Sep 2016 18:34:42 +0000 (18:34 +0000)]
Merge "fix wrong algorithm in WifiPowerPerPacket()"
am:
16e1007481
Change-Id: I3bacf3deb99b10c5ae8fe22a02ad7066afc321e0
Treehugger Robot [Mon, 19 Sep 2016 18:28:46 +0000 (18:28 +0000)]
Merge "fix wrong algorithm in WifiPowerPerPacket()"
Etan Cohen [Mon, 19 Sep 2016 16:11:34 +0000 (16:11 +0000)]
Merge "[NAN] Make parcelable class final - per API linter"
am:
3fcabac35a
Change-Id: Id769353ac251015fbd3af2c5e0134c5de5b418d4
Etan Cohen [Mon, 19 Sep 2016 16:03:59 +0000 (16:03 +0000)]
Merge "[NAN] Make parcelable class final - per API linter"
Etan Cohen [Fri, 9 Sep 2016 23:17:31 +0000 (16:17 -0700)]
[NAN] Make parcelable class final - per API linter
(cherry-pick of
feef60406e961afcda8893c7560382382c358910)
Bug:
31380952
Test: build + sl4a integration test (WifiNanManagerTest:test_nan_discovery_session)
Change-Id: I74c079763d6b3a4f0119b16acd7a18014a10ebbd
yuanhuihui [Mon, 12 Sep 2016 02:34:53 +0000 (10:34 +0800)]
fix wrong algorithm in WifiPowerPerPacket()
step1: PowerProfile.POWER_WIFI_ACTIVE represents energy consumption(mAh) per hour
devied by 3600, then WIFI_POWER ==> energy consumption(mAh) per second
step2: WIFI_BPS represents
1000000 bit per second
then (double)WIFI_BPS) / 8 ==>
1000000/8 Byte per second
step3: as upload and download, so divided by 2;
then (((double)WIFI_BPS) / 8 / 2048)) ==>
1000000/8/2048 KB per second
==> packet per second (where 1 packet = 2 KB)
so WIFI_POWER / (((double)WIFI_BPS) / 8 / 2048) represents mAh per Packet where 1 packet = 2 K.
when divided by (60*60) again , that make WifiPowerEstimator narrow 3600 times.
Change-Id: Ic055a5145b6dfb1129c8969826329a3024c9e2b6
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
Rebecca Silberstein [Thu, 15 Sep 2016 05:07:04 +0000 (22:07 -0700)]
WifiScanner: retrieve single scan results
Add a new CMD_GET_SINGLE_SCAN_RESULTS message type and
getSingleScanResults method that allow WifiService to get
scan results directly from WifiScanner.
BUG:
31444878
Test: manually tested on angler
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh on angler
Test: ran GTS CtsNetTestCases on angler
Change-Id: I705233d7dc4ae7e8480c53ff0f9e1b6c8875fecb
Roshan Pius [Fri, 16 Sep 2016 22:44:49 +0000 (22:44 +0000)]
Merge "WifiScanner: Change hidden/PNO scan params"
am:
b1161c83f9
Change-Id: I2d517f18f1cd9e412467785316c8b67e1a1a400d
Roshan Pius [Fri, 16 Sep 2016 22:34:57 +0000 (22:34 +0000)]
Merge "WifiScanner: Change hidden/PNO scan params"
Etan Cohen [Fri, 16 Sep 2016 18:41:31 +0000 (18:41 +0000)]
Merge changes from topic 'undo_do_not_merge' into stage-aosp-master
* changes:
Give WakeupMessage the ability to transport an object as well.
[NAN] Add transport type for NAN.
Tianjie Xu [Fri, 16 Sep 2016 18:30:38 +0000 (18:30 +0000)]
Merge "Collect status on uncrypt time cost"
am:
bc19e00d35
Change-Id: I867821b7575ee2e45bb86c46222e6cf34971689d
Mark Lu [Fri, 16 Sep 2016 18:26:10 +0000 (18:26 +0000)]
Merge "[AM] Skip unnessary ANR when process already died."
am:
831a4aea1e
Change-Id: Ib8c0ffa8d50bb5a3fbc2d8f35274a8301494cd93
Tianjie Xu [Fri, 16 Sep 2016 18:19:22 +0000 (18:19 +0000)]
Merge "Collect status on uncrypt time cost"
Treehugger Robot [Fri, 16 Sep 2016 18:16:22 +0000 (18:16 +0000)]
Merge "[AM] Skip unnessary ANR when process already died."
Robert Sesek [Fri, 16 Sep 2016 17:37:43 +0000 (17:37 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base."
am:
9c08f6bb82
Change-Id: Ia58d4bb105e564437216b9e951b83e721f47c51d
Robert Sesek [Fri, 16 Sep 2016 17:32:49 +0000 (17:32 +0000)]
Move art::Runtime::InitZygote logic from art into frameworks/base.
am:
e4f8d69c58
Change-Id: Ia6fdf02ba9d7cd6e473d2891d5b8e59b4e967347
Treehugger Robot [Fri, 16 Sep 2016 17:23:41 +0000 (17:23 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base."
Lorenzo Colitti [Tue, 7 Jun 2016 07:27:10 +0000 (16:27 +0900)]
Give WakeupMessage the ability to transport an object as well.
(cherry-pick of commit
eab17da5882e59caff25c73aa6bcd0587aca9dd4)
(cherry-pick of commit
4171cdf303c24704c2412653fd0eccb21a487e8e)
Bug:
23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
Etan Cohen [Mon, 20 Jun 2016 16:27:12 +0000 (09:27 -0700)]
[NAN] Add transport type for NAN.
Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.
While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.
(cherry-pick of commit
7b84987a6acf2f0a950c334a17a6ee085db3ba4f)
(cherry-pick of commit
bd9fdbe02275f51c1e24a451aecd40038c4a20e1)
Bug:
26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75
Mark Lu [Wed, 23 Mar 2016 11:08:44 +0000 (19:08 +0800)]
[AM] Skip unnessary ANR when process already died.
When app process been killed by AMS or lowmemkiller just before ANR report,
because process record info has been cleared after received death recipient,
it also cannot dump trace log because process already dead,
so report ANR & show ANR UI to let user wait seems is unnecessary.
(compare normal ANR case, if kill app process by command,
ANR dialog will also dismissed, it seems reasonable.)
To check above condition, if ANR process record killed set as true,
it means process already dead & can skip report this ANR.
Change-Id: I483cb02bacb10c32db80ca1097310b02abbac24d
Elliott Hughes [Fri, 16 Sep 2016 08:43:56 +0000 (08:43 +0000)]
Merge "Stop including libcore/include/ in most of frameworks/base."
am:
05884ac869
Change-Id: I4f919dc0bfcb4d9ecd65c61b304c01169ba3ce8a
Treehugger Robot [Fri, 16 Sep 2016 08:36:44 +0000 (08:36 +0000)]
Merge "Stop including libcore/include/ in most of frameworks/base."
Gopal Krishna Shukla [Fri, 16 Sep 2016 05:31:29 +0000 (05:31 +0000)]
Merge "Remove synchronization from getCurrentInputMethodSubtype()"
am:
85539bed77
Change-Id: I0f564ebcb74d4c17a4d18ab2fe8660c977731590
Treehugger Robot [Fri, 16 Sep 2016 05:21:33 +0000 (05:21 +0000)]
Merge "Remove synchronization from getCurrentInputMethodSubtype()"
Gopal Krishna Shukla [Thu, 30 Jun 2016 06:04:21 +0000 (11:34 +0530)]
Remove synchronization from getCurrentInputMethodSubtype()
getCurrentInputMethodSubtype() acquires InputManagerService.mMethodMap
within its body. There seems to be no reason for holding
InputMethodManager.mH to call getCurrentInputMethodSubtype(). Holding mH
can cause potential deadlock b/w two threads acquiring mH and mMethodMap
in different orders.
Bug:
31247871
Bug:
31273203
Bug: b.android.com/218423
Change-Id: I20cf2c20f49b1b02c0f7a18257b49d4bcc081b5d
Elliott Hughes [Thu, 15 Sep 2016 20:13:39 +0000 (13:13 -0700)]
Stop including libcore/include/ in most of frameworks/base.
frameworks/base/core/jni/android_text_StaticLayout.cpp does actually use
ScopedIcuLocale, so I've left that for now.
Change-Id: I6458cd133871281a747a9da2e304da10b445051a
Robert Sesek [Tue, 13 Sep 2016 23:13:01 +0000 (19:13 -0400)]
Move art::Runtime::InitZygote logic from art into frameworks/base.
Test: m
Test: aosp_angler-eng boots
Change-Id: I964c70576136e7424797140b2f7d179e70298c44
Roshan Pius [Mon, 12 Sep 2016 20:46:32 +0000 (13:46 -0700)]
WifiScanner: Change hidden/PNO scan params
Since networks are no longer configured in wpa_supplicant, network
IDs/priorities being passed around for hidden/PNO scanning does not
make any sense.
Changing the wifi scanner interface to remove all network ID/priority
references. These will be replaced by SSID of the corresponding
networks for hidden networks.
BUG:
29503772
TEST: Existing unit tests.
TEST: Successfully connected to a hidden network on device
Change-Id: I5d877e0345d574fb513b6eecca14f65f2ee4e7ab
Tobias Lindskog [Wed, 14 Sep 2016 14:00:54 +0000 (14:00 +0000)]
Merge "Skip ANR for processes that have been killed"
am:
9d9cf5b383
Change-Id: I4c88713b7b174908faa6f8703257c40cabd59ae7
Treehugger Robot [Wed, 14 Sep 2016 13:54:36 +0000 (13:54 +0000)]
Merge "Skip ANR for processes that have been killed"
Narayan Kamath [Wed, 14 Sep 2016 13:15:51 +0000 (13:15 +0000)]
Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal."
am:
796578f9a9
Change-Id: I74c142183c3632f725b6992388235ad8e59bc389
Treehugger Robot [Wed, 14 Sep 2016 13:07:05 +0000 (13:07 +0000)]
Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal."
Narayan Kamath [Tue, 13 Sep 2016 15:19:33 +0000 (16:19 +0100)]
app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal.
Don't make allowances for older kernels. Kernels must handle this
properly since it is now a CTS requirement.
Also remove some unreachable return statements.
Change-Id: I280c4ed5e461d37672236747b5dbb7d1e97ecfec
liulvping [Tue, 13 Sep 2016 21:04:55 +0000 (21:04 +0000)]
Merge "fix NullPointerException in RegisteredServicesCache"
am:
4b1a8f46d6
Change-Id: I1ba9512647d515aedbaf09eb2d7ac524477e5296
Treehugger Robot [Tue, 13 Sep 2016 20:57:10 +0000 (20:57 +0000)]
Merge "fix NullPointerException in RegisteredServicesCache"
Cuihtlauac ALVARADO [Tue, 13 Sep 2016 12:49:41 +0000 (14:49 +0200)]
Fix parameter description
Correct parameter description text according to method name.
Change-Id: If6bd8254386a84efd338b58797c2c338ccb513b7
Felipe Leme [Mon, 12 Sep 2016 21:14:10 +0000 (21:14 +0000)]
Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."
am:
1bb0616c56 -s ours
Change-Id: I281ad8d15f59927185e6beaf209c609f2282ef61
Treehugger Robot [Mon, 12 Sep 2016 21:07:39 +0000 (21:07 +0000)]
Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."
Mitchell Wills [Mon, 12 Sep 2016 20:54:46 +0000 (20:54 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels"
am:
c7b84e6d0d
Change-Id: I8c874c282db93dbb531c9c7e27540044c446144e
Robert Sesek [Mon, 12 Sep 2016 20:54:42 +0000 (20:54 +0000)]
Merge changes I104e6133,I54f04c03
am:
191ddb0c27
Change-Id: I7376f7594314c26926c3b41ffbe4202b865f9091
Robert Sesek [Mon, 12 Sep 2016 20:54:39 +0000 (20:54 +0000)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
am:
96b49848e7 -s ours
Change-Id: I2796758fa0a083ade4b4186eae7210c841c719ed
Tobias Sargeant [Mon, 12 Sep 2016 20:52:36 +0000 (20:52 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote.
am:
b9679dc1fa -s ours
Change-Id: I6071cb6e8ed2f85351c9fc23f88beed0c6b1fdc9
Mitchell Wills [Mon, 12 Sep 2016 20:38:20 +0000 (20:38 +0000)]
Merge "Add a flag to indicate if a ScanData is for a scan for all channels"
Treehugger Robot [Mon, 12 Sep 2016 19:42:01 +0000 (19:42 +0000)]
Merge changes I104e6133,I54f04c03
* changes:
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
Refactor ZygoteInit to support a WebView-specific zygote.
Mitchell Wills [Tue, 6 Sep 2016 22:08:36 +0000 (15:08 -0700)]
Add a flag to indicate if a ScanData is for a scan for all channels
BUG=
30897947
Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b
(cherry picked from commit
4bfb391c91b3539d2ec20ffd7e01056dafa0984d)
Elliott Hughes [Mon, 12 Sep 2016 17:00:09 +0000 (17:00 +0000)]
Merge "Move frameworks/base to std::unique_ptr."
am:
a4739b86b5
Change-Id: Ib07b6585faf4a8b3cc1c2f3e46f1ee27b4865db2
Elliott Hughes [Mon, 12 Sep 2016 16:50:17 +0000 (16:50 +0000)]
Merge "Move frameworks/base to std::unique_ptr."
Elliott Hughes [Sun, 11 Sep 2016 21:50:12 +0000 (14:50 -0700)]
Move frameworks/base to std::unique_ptr.
Bug: http://b/
22403888
Change-Id: Iae2c68b00be7cd9dd215a75cf80b16d7403f6328
Chih-hung Hsieh [Sat, 10 Sep 2016 17:15:05 +0000 (17:15 +0000)]
Merge "Fix google-explicit-constructor warnings in media utils."
am:
5e91082b3c
Change-Id: I4bb1f347db727e86c1255ccbb0e15dc9cc00169f
Chih-hung Hsieh [Sat, 10 Sep 2016 17:07:53 +0000 (17:07 +0000)]
Merge "Fix google-explicit-constructor warnings in media utils."
dooyoung.hwang [Fri, 9 Sep 2016 21:52:16 +0000 (21:52 +0000)]
Merge "Fix issue that Overview key doesn't work at secondary user"
am:
5379f47d85
Change-Id: Ieaf3e7261e88f62cbbf748eb9ff94d03711f05c0
Treehugger Robot [Fri, 9 Sep 2016 21:46:04 +0000 (21:46 +0000)]
Merge "Fix issue that Overview key doesn't work at secondary user"
Tianjie Xu [Fri, 9 Sep 2016 18:27:32 +0000 (11:27 -0700)]
Collect status on uncrypt time cost
Read and report time cost of uncrypt (in seconds) from last_install.
Bug:
31383361
Change-Id: I283970c33b2a0324f2f51cde328e3e527eff7c58
Robert Sesek [Fri, 18 Mar 2016 20:52:57 +0000 (16:52 -0400)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
There is no functional change. This is to support adding new types of zygotes
that all operate using the same protocol.
Bug:
21643067
(cherry picked from commit
94e824bc1b5f83024b7c9a228a8f2d0cd1347d11)
Merged-In: Ie673ee816cae34ac20ffb8c774ec3e6461c3fd0a
Change-Id: I104e6133a90dc93a9854836b5e92d3cd542163a3
Tobias Sargeant [Tue, 19 Jan 2016 16:34:54 +0000 (16:34 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote.
This is a non-functional change that separates out functionality
that should be shared between the system zygote and the WebView
zygote from that which is system zygote specific.
* Move MethodAndArgsCaller to Zygote.
* Split out server socket functions into ZygoteServer.
* Add a new (stub, for now) WebViewZygoteInit class.
Bug:
22084679
Bug:
21643067
(cherry picked from commit
ba816e0c9efd8cd2aeef618a819a2ad46b742f87)
Merged-In: I4c508a42af7ab7b53d10570ad53b846df7782cc4
Change-Id: I54f04c03443d10dabe6426697d1ff8a0cc66b985
Andreas Huber [Fri, 9 Sep 2016 15:56:30 +0000 (15:56 +0000)]
Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated."
am:
077678590f
Change-Id: I0156dc289ab61dda9bf8330f40d678c8c2bb8163
Treehugger Robot [Fri, 9 Sep 2016 15:47:44 +0000 (15:47 +0000)]
Merge "char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated."
Felipe Leme [Fri, 9 Sep 2016 00:09:08 +0000 (17:09 -0700)]
DO NOT MERGE. Listen to ACTION_UID_REMOVED only.
NMPS was listening to both ACTION_UID_REMOVED and
ACTION_PACKAGE_REMOVED, which not only was redundant but would also
cause problems when a package with shared UIDs was removed.
BUG:
31375684
Change-Id: I78da95ef168321a837ed85ce2787a66a16830a78
Andreas Huber [Thu, 8 Sep 2016 20:52:36 +0000 (13:52 -0700)]
char16 strings returned by JNIEnv::GetStringCritical are not '\0' terminated.
Properly construct String16s from both pointer and length instead.
Bug:
31373735
Change-Id: Ia89df7840a48c4fce06e08fc3ae373e0fadfb44e
Tobias Thierer [Thu, 8 Sep 2016 13:21:07 +0000 (13:21 +0000)]
Merge "Add Base64 from OpenJDK 8u60"
am:
63a07e80d6
Change-Id: Ia7fd23891c93093003804adb48e9f584d225be7c
Tobias Thierer [Thu, 8 Sep 2016 13:10:14 +0000 (13:10 +0000)]
Merge "Add Base64 from OpenJDK 8u60"
Sergio Giro [Thu, 8 Sep 2016 12:27:35 +0000 (12:27 +0000)]
Merge "java.security.Provider: port to jdk8u60 (second part)"
am:
8445702920
Change-Id: I54c53518876f9480b5ef13c4a730f700867b9057
Paul Duffin [Thu, 8 Sep 2016 12:27:27 +0000 (12:27 +0000)]
Merge "Fix SuppressWarnings typo."
am:
0bd7c54745
Change-Id: I43a9bea860188f55292dcbeac38bf026d87fa634
Sergio Giro [Thu, 8 Sep 2016 12:18:43 +0000 (12:18 +0000)]
Merge "java.security.Provider: port to jdk8u60 (second part)"
Paul Duffin [Thu, 8 Sep 2016 12:17:05 +0000 (12:17 +0000)]
Merge "Fix SuppressWarnings typo."
Ian Rogers [Fri, 27 May 2016 21:31:19 +0000 (14:31 -0700)]
Fix SuppressWarnings typo.
As Error Prone states:
Suppressing "deprecated" is probably a typo for "deprecation"
Bug:
27723540
(cherry picked from commit
a7f834f1ce5ec52acdde5a8619d91a18f3376598)
Change-Id: I0c6a9fc0a160769955cccf97ec7decb1f2b9b8fb
Yi Kong [Thu, 8 Sep 2016 10:07:06 +0000 (10:07 +0000)]
Merge "Track libcore change
76fa41aa4ac891670446592243b654fac7deb53f"
am:
3bc37e9cf7
Change-Id: Ia12afe847d012cbc55e5b043074e4e6c7864a52c
Yi Kong [Thu, 8 Sep 2016 09:59:54 +0000 (09:59 +0000)]
liulvping [Thu, 8 Sep 2016 01:16:48 +0000 (09:16 +0800)]
fix NullPointerException in RegisteredServicesCache
https://code.google.com/p/android/issues/detail?id=221932
Change-Id: I67c0b799d10f4b9c8fa0779069d23cc49916b395
Signed-off-by: liulvping <liulvping@xiaomi.com>
Roshan Pius [Wed, 7 Sep 2016 21:51:18 +0000 (21:51 +0000)]
Merge "WifiManager: Remove unused methods"
am:
efb7bec56a
Change-Id: I68d2ee571f04136a7c4babbdfa097d5449cc5ac3
Treehugger Robot [Wed, 7 Sep 2016 21:43:19 +0000 (21:43 +0000)]
Merge "WifiManager: Remove unused methods"
Yi Kong [Mon, 29 Aug 2016 15:47:00 +0000 (16:47 +0100)]
Track libcore change
76fa41aa4ac891670446592243b654fac7deb53f
Bug:
30992227
Change-Id: I33c25562468f5803e211910f50116b501b66fe56
dooyoung.hwang [Wed, 31 Aug 2016 05:15:22 +0000 (14:15 +0900)]
Fix issue that Overview key doesn't work at secondary user
If user captures screenshot, screenshot process is started. Screenshot
process also starts services that is defined SERVICES_PER_USER.
As a result Recents class's object is unexpectedly constucted from
screenshot process, and cause to connect with system-user's SystemUI
with mUserToSystemServiceConnection. So, binder proxy from system-user's
SystemUI to secondary-user's SystemUI is replaced with proxy to
screenshot process. In this case Overview key doesn't work at all
until reboot.
Bug:
30340532
Change-Id: I84b8b4a02ac3ff781e06d57be19cff56efa76521
Roshan Pius [Wed, 7 Sep 2016 15:55:32 +0000 (15:55 +0000)]
Merge "WifiEnterpriseConfig: Refactor set/get field values"
am:
c4856bd73c
Change-Id: Id78dd9286f755f4cd1a9057f42972b8bfdc5caa9
Roshan Pius [Wed, 7 Sep 2016 15:47:39 +0000 (15:47 +0000)]
Merge "WifiEnterpriseConfig: Refactor set/get field values"
Tobias Lindskog [Tue, 3 Feb 2015 10:45:58 +0000 (11:45 +0100)]
Skip ANR for processes that have been killed
If a controller is attached and decides to kill a process after an ANR,
other ANR reports for that app that are queued up won't be handled until
after the app has died. This can create a report without the relevant
callstacks because the app is dead by the time the traces are dumped.
Since the trace file is global, the traces recorded for the first ANR
are overwritten, leaving us with no clue as to what happened.
After the app has been killedByAm, it is not interesting to handle ANRs
for that app until it is started again, so killedByAm can be used to
filter out these spurious reports.
Change-Id: I34ba790f6d29d563c819dc2f6ac71a3c8955bb76
Sergio Giro [Wed, 7 Sep 2016 12:21:36 +0000 (12:21 +0000)]
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"
am:
12d3d4bbba
Change-Id: I27e64111dc18e052884b3b571f93a17c9d5f663c
Sergio Giro [Wed, 7 Sep 2016 12:21:17 +0000 (12:21 +0000)]
Merge "java.security.PKCS12Attribute: port class from jdk8u60"
am:
6767fd28b1
Change-Id: Ib80d6ae24734def58881a4536b232870fb885015
Sergio Giro [Wed, 7 Sep 2016 12:20:49 +0000 (12:20 +0000)]
Merge "java.security.SecureRandom: add getInstanceStrong() method"
am:
4c2df18a4d
Change-Id: I5faf9c49a7d09e8eef38edd6cf32de4f65783e5d
Sergio Giro [Wed, 7 Sep 2016 12:14:47 +0000 (12:14 +0000)]
Merge "java.security: port DomainLoadStoreParameter from jdk8u60"
am:
59c0fcf0c8
Change-Id: I8fd7dc636a579c67c4b9851f4babae30e19a2024
Sergio Giro [Wed, 7 Sep 2016 12:08:27 +0000 (12:08 +0000)]
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"
Sergio Giro [Wed, 7 Sep 2016 12:07:13 +0000 (12:07 +0000)]
Merge "java.security.PKCS12Attribute: port class from jdk8u60"
Sergio Giro [Wed, 7 Sep 2016 12:05:35 +0000 (12:05 +0000)]
Merge "java.security.SecureRandom: add getInstanceStrong() method"
Sergio Giro [Wed, 7 Sep 2016 12:04:20 +0000 (12:04 +0000)]
Merge "java.security: port DomainLoadStoreParameter from jdk8u60"
Yohann Roussel [Wed, 7 Sep 2016 10:03:08 +0000 (10:03 +0000)]
Merge "Add a test app for suppressed exceptions"
am:
15c6078f4d
Change-Id: I45692cdf5081fe848935075d861fad11e68d19ba
Yohann Roussel [Wed, 7 Sep 2016 09:52:49 +0000 (09:52 +0000)]
Merge "Add a test app for suppressed exceptions"
Etan Cohen [Wed, 7 Sep 2016 04:33:23 +0000 (04:33 +0000)]
Merge changes from topic 'enable_nan'
am:
62419a0138
Change-Id: I98abd87843ed3f2fde6c5b1fe1234563e03e0216
Lorenzo Colitti [Wed, 7 Sep 2016 04:28:21 +0000 (04:28 +0000)]
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
am:
4171cdf303 -s ours
Change-Id: I2d3f4c4b11ba2a39649c7747fbe1cee1ff16f198
Etan Cohen [Wed, 7 Sep 2016 04:27:28 +0000 (04:27 +0000)]
[NAN] Add transport type for NAN. [DO NOT MERGE]
am:
bd9fdbe022 -s ours
Change-Id: I5b313eda3f872b9938b0092d4fc197e5af8ac8b7
Etan Cohen [Wed, 7 Sep 2016 04:19:51 +0000 (04:19 +0000)]
Merge changes from topic 'enable_nan'
* changes:
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
[NAN] Add transport type for NAN. [DO NOT MERGE]
Roshan Pius [Tue, 6 Sep 2016 23:02:10 +0000 (23:02 +0000)]
Merge "WifiConfiguration: Fix isEnterprise"
am:
9221c96ae0
Change-Id: I439205f4db4bfc292f084ea716014d64353c2885
Lorenzo Colitti [Tue, 7 Jun 2016 07:27:10 +0000 (16:27 +0900)]
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
(cherry-pick of commit
eab17da5882e59caff25c73aa6bcd0587aca9dd4)
Bug:
23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
Etan Cohen [Mon, 20 Jun 2016 16:27:12 +0000 (09:27 -0700)]
[NAN] Add transport type for NAN. [DO NOT MERGE]
Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.
While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.
(cherry-pick of commit
7b84987a6acf2f0a950c334a17a6ee085db3ba4f)
Bug:
26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75