OSDN Git Service
Etan Cohen [Thu, 22 Sep 2016 04:55:21 +0000 (04:55 +0000)]
Merge "[NAN] Method renames based on API council feedback"
am:
dcac00f325
Change-Id: I1eaa81952e2826f25de9e3e9f4edfa23db368f5a
Etan Cohen [Thu, 22 Sep 2016 00:52:47 +0000 (00:52 +0000)]
Merge "[NAN] Method renames based on API council feedback"
Greg Hackmann [Wed, 21 Sep 2016 21:15:30 +0000 (21:15 +0000)]
Merge changes Iaa153fca,I619e2d8a
am:
59acc059a6
Change-Id: Ic657c33aa5fd728d0e5a8fc3c6c23c0fff420844
Greg Hackmann [Wed, 21 Sep 2016 21:15:13 +0000 (21:15 +0000)]
AlarmManagerService: explain some timerfd_create() failures
am:
a0126e0857
Change-Id: I7c9e394d2edcca81e757e351f9de25447b33c2f4
Greg Hackmann [Wed, 21 Sep 2016 21:13:56 +0000 (21:13 +0000)]
AlarmManagerService: remove legacy /dev/alarm support
am:
d7151c06f1
Change-Id: Ibefee7970e426f69e62b9f31fb7a38d24ad63c2a
Greg Hackmann [Wed, 21 Sep 2016 21:04:09 +0000 (21:04 +0000)]
Merge changes Iaa153fca,I619e2d8a
* changes:
AlarmManagerService: explain some timerfd_create() failures
AlarmManagerService: remove legacy /dev/alarm support
Andre Eisenbach [Wed, 21 Sep 2016 20:51:07 +0000 (20:51 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
am:
e2d9cc4bc9
Change-Id: I7e83f318b9a8ab0520d4df66d9faa96e768df612
Etan Cohen [Tue, 20 Sep 2016 16:23:33 +0000 (09:23 -0700)]
[NAN] Method renames based on API council feedback
- Fix tenses throughout
- connect -> attach
- disconnect/terminate -> destroy
- IsUsable -> IsAvailable
Note: pure rename operation - no functional changes
(cherry-pick of commit
34a0342ab515762f3fc594ffbc4784e56e79ccbf)
Bug:
31470256
Test: unit tests + integration (sl4a) test
Change-Id: I0f275c590c63109b7196622cfc5001082e3eb5a2
Andre Eisenbach [Wed, 21 Sep 2016 20:38:31 +0000 (20:38 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
Chris Tate [Wed, 21 Sep 2016 20:34:49 +0000 (20:34 +0000)]
Merge "Fix WallpaperManager APIs"
am:
73e89cd290
Change-Id: I6dd139e8ccb71e6c64141733f9de031b20694179
Chris Tate [Wed, 21 Sep 2016 20:26:00 +0000 (20:26 +0000)]
Merge "Fix WallpaperManager APIs"
Etan Cohen [Wed, 21 Sep 2016 20:21:25 +0000 (20:21 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
am:
84b3d2040a
Change-Id: I3c20098f26db9e30c18407d01b21ffe729318cce
Etan Cohen [Wed, 21 Sep 2016 20:14:13 +0000 (20:14 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
Etan Cohen [Thu, 15 Sep 2016 19:15:10 +0000 (12:15 -0700)]
[NAN] Refactor WifiNanManager to create separate sessions per connect.
Separate session enables separate namespace for functions which depend
on a connection to exist.
(cherry-pick of commit
a2eb21d1233e921487e3dada1d10ba3e14611168)
Bug:
31470256
Test: unit tests, integration (sl4a) tests.
Change-Id: I8be0bc609e55319446cef149ba49cd6f7a5f446a
Jack He [Tue, 20 Sep 2016 23:06:32 +0000 (16:06 -0700)]
List btopp.intent.action.ACCEPT broadcast as protected
Bug:
31604112
Test: manual
Change-Id: Ic5ee837bb895fc5b39b6d1abdd91d8f1d33f62ae
Andre Eisenbach [Wed, 21 Sep 2016 17:49:45 +0000 (17:49 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast"
am:
6eb62f8ee3
Change-Id: I013391d9b75b6a968f5c7c449ce7cac0501448f4
Andre Eisenbach [Wed, 21 Sep 2016 17:38:47 +0000 (17:38 +0000)]
Merge "Protect REFRESH_BATCHED_SCAN broadcast"
Ajay Panicker [Tue, 28 Jun 2016 23:12:37 +0000 (16:12 -0700)]
Protect REFRESH_BATCHED_SCAN broadcast
Bug:
29754520
Test: cherry-pick from internal tree
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
(cherry picked from commit
58dd0cd65e7ac9ca0c9ccbf42087baf2df751c61)
Neil Fuller [Wed, 21 Sep 2016 16:18:36 +0000 (16:18 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring"
am:
117ef7eb9d
Change-Id: Icceb5e5aa4ba12ac837b838e07d338a805f37614
Neil Fuller [Wed, 21 Sep 2016 16:01:56 +0000 (16:01 +0000)]
Merge "Track API changes associated with AbstractMethod refactoring"
Neil Fuller [Thu, 8 Sep 2016 11:08:22 +0000 (12:08 +0100)]
Track API changes associated with AbstractMethod refactoring
No actual API change.
Bug:
28666126
Bug:
31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: I8755509f9b6e5387e071a3550b197167bab6ae04
Neil Fuller [Wed, 21 Sep 2016 11:52:17 +0000 (11:52 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"
am:
0acc91e4fc
Change-Id: I5833ef112d1d9031a48b899723cc4f10703d062d
Neil Fuller [Wed, 21 Sep 2016 11:45:18 +0000 (11:45 +0000)]
Merge "Tracking unhiding of java.lang.reflect.Parameter APIs"
Neil Fuller [Tue, 6 Sep 2016 18:04:18 +0000 (19:04 +0100)]
Tracking unhiding of java.lang.reflect.Parameter APIs
Bug:
28666126
Change-Id: I37926f8f221dca7e99ffd233a0990fcfa4d56040
Michal Karpinski [Wed, 21 Sep 2016 08:39:42 +0000 (08:39 +0000)]
Merge "Rename the DnsEventListenerService to NetdEventListenerService"
am:
1e3f586c10
Change-Id: Ie83aa7e6225a42c11c03eae45f593e74b94efc82
Michal Karpinski [Wed, 21 Sep 2016 08:34:38 +0000 (08:34 +0000)]
Merge "Rename the DnsEventListenerService to NetdEventListenerService"
Michal Karpinski [Thu, 15 Sep 2016 08:07:08 +0000 (17:07 +0900)]
Rename the DnsEventListenerService to NetdEventListenerService
The service will be extended to include listening for connect events as well.
Test: this is just a renaming change
Bug:
29748723
Change-Id: I4e50e24d1bfb0b5ead4010cc7df3434d38b753d8
Christopher Wiley [Tue, 20 Sep 2016 21:41:03 +0000 (21:41 +0000)]
Merge "Allow WiFi components to manage interface up state"
am:
dfa6e6f186
Change-Id: If2bdb1b6671465daffa8c0161f52c8693146a816
Greg Hackmann [Mon, 2 May 2016 20:22:51 +0000 (13:22 -0700)]
AlarmManagerService: explain some timerfd_create() failures
When AlarmManagerService is broken, starting the framework fails in
weird and inconsistent ways. So if we detect your kernel is missing the
required timerfd support, give up immediately and explain why.
Bug:
28357356
Test: manually break timerfd_create syscall, check adb logcat during boot
Change-Id: Iaa153fca38e9cd8e801f3e71c3e1ae2351907828
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Treehugger Robot [Tue, 20 Sep 2016 21:27:54 +0000 (21:27 +0000)]
Merge "Allow WiFi components to manage interface up state"
Andreas Huber [Tue, 20 Sep 2016 20:48:53 +0000 (20:48 +0000)]
Merge "Removed legacy code used to read/write java arrays from HwBinder parcels."
am:
eda7bc5c84
Change-Id: If256977b368ec830f1c01f86c3845d9313c38767
Treehugger Robot [Tue, 20 Sep 2016 20:28:11 +0000 (20:28 +0000)]
Merge "Removed legacy code used to read/write java arrays from HwBinder parcels."
Greg Hackmann [Mon, 25 Apr 2016 20:30:34 +0000 (13:30 -0700)]
AlarmManagerService: remove legacy /dev/alarm support
We've removed the Android alarm driver from our supported kernels. It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.
Bug:
28357356
Test: cts-tradefed run singleCommand cts -d -c android.app.cts.AlarmManagerTest
Change-Id: I619e2d8a98e4c4728131a2d826b1295f858abedd
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Etan Cohen [Tue, 20 Sep 2016 16:50:01 +0000 (16:50 +0000)]
Merge "[NAN] Rename to make discovery explicit"
am:
5706a8f535
Change-Id: Ic71e0eced353dfdfb989876ddb4c11f4188625c5
Etan Cohen [Tue, 20 Sep 2016 16:41:04 +0000 (16:41 +0000)]
Merge "[NAN] Rename to make discovery explicit"
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 [Wed, 14 Sep 2016 21:41:56 +0000 (14:41 -0700)]
[NAN] Rename to make discovery explicit
Pure rename operation - no other functional changes.
(cherry-pick of commit
ddb5f646562f31d7e78778a978e546f85312b009)
Bug:
31470256
Test: unit tests, integrated (sl4a) tests.
Change-Id: I5110d1a673b7ba4e39350d723b5984586fec585a
Christopher Wiley [Tue, 13 Sep 2016 19:07:58 +0000 (12:07 -0700)]
Allow WiFi components to manage interface up state
Setting the WiFi network interface up or down is racy because it
is not synchronized with the WiFi components managing the interface.
This causes a problem for hostapd when the interface is marked down
before hostapd starts because it causes the driver to enter the
de-initialization process. hostapd does not know how to react to this
change of events.
Bug:
31205821
Test: bug no longer reproduces on upcoming devices, unit tests pass
Change-Id: I96938e2aef89b400593d42ce1b0a6ccc2d2e5754
Andreas Huber [Mon, 19 Sep 2016 19:36:19 +0000 (12:36 -0700)]
Removed legacy code used to read/write java arrays from HwBinder parcels.
More generalized functionality is now available through HwBlob.
Change-Id: Id6c713fb01af7593ea3ff8405f3a9e5325877412
Bug:
31438033
Test: run updated "hidl_test" and "hidl_test_java"
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