Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
279,500 Commits 3 Branches 0 Tags
4bb5848a93d1edda4e4bb85aa99e217673fd00ae
Commit Graph

68685 Commits

Author SHA1 Message Date
Tao Bao
b20ce70cca Merge "Revert "RecoverySystem: Fix the issue in installPackage()."" am: 9311dbf9e4 
am: 731445ebf7

Change-Id: Ia111f153277e0648ea4d3f37d7c928621cd21ca2
 2017-01-19 01:59:19 +00:00
Tao Bao
731445ebf7 Merge "Revert "RecoverySystem: Fix the issue in installPackage()."" 
am: 9311dbf9e4

Change-Id: Ife949ce113387e2834f25c49d41adf4eec44bba2
 2017-01-19 01:55:47 +00:00
Tao Bao
9311dbf9e4 Merge "Revert "RecoverySystem: Fix the issue in installPackage()."" 2017-01-19 01:47:10 +00:00
Tao Bao
cc76991f37 Revert "RecoverySystem: Fix the issue in installPackage()." 
This reverts commit 9f7a0acd2d.

Bug: 34350643
Bug: 34396955
Test: installPackage() doesn't cause deadlock if it doesn't call
      processPackage() prior to that.
Change-Id: I1da055c86a3326ae341da1b4d5dc79ab4be256fb
 2017-01-19 01:31:57 +00:00
Peng Xu
2146f7ef42 Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: cec2ebf676 
am: 8cddb920b5

Change-Id: I60391477badc56373f231911aae4172ee8d5cdf0
 2017-01-19 01:22:22 +00:00
Peng Xu
8cddb920b5 Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" 
am: cec2ebf676

Change-Id: I1f66dba79c07315ca07edf65ff4e7f1135083d6e
 2017-01-19 01:17:42 +00:00
Peng Xu
cec2ebf676 Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" 2017-01-19 01:11:49 +00:00
Tamas Berghammer
b4050d8042 Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp 2017-01-18 19:59:59 +00:00
Tamas Berghammer
24d8553316 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" 
This reverts commit cbd3f0c59a.

Change-Id: I6e8d193fa22e0e7e30b214c13ae0480d3c9b0dc6
 2017-01-18 19:33:22 +00:00
Tamas Berghammer
3db5d42f90 Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp 2017-01-18 12:58:01 +00:00
Svetoslav Ganov
631370fa36 [DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 
am: a7ff8fbe74

Change-Id: Id672b82ddba7aee6e3c2748a7fae1e9f879538aa
 2017-01-17 23:02:56 +00:00
Svetoslav Ganov
a7ff8fbe74 [DO NOT MERGE] Prevent crash from early Toast surface destruction. 
am: 016c9c8cb5

Change-Id: Ib33d75a050a1b79de9590f2dbe03609c6e2b4463
 2017-01-17 22:58:18 +00:00
Lorenzo Colitti
8cf7169564 Merge "Delete dead code." am: cf59ff79c5 
am: d305a7c894

Change-Id: Icdb4d429fcdf4060feab8a25cf67b3a230a35eb7
 2017-01-17 06:02:30 +00:00
Lorenzo Colitti
d305a7c894 Merge "Delete dead code." 
am: cf59ff79c5

Change-Id: Ifbb591a7bbed9c2a8f83fe321c3d12f08e096fe3
 2017-01-17 05:55:50 +00:00
Treehugger Robot
cf59ff79c5 Merge "Delete dead code." 2017-01-17 05:44:58 +00:00
Tao Bao
5c610492c8 Merge "RecoverySystem: Fix the issue in installPackage()." am: 3b2fe9f7b9 
am: 6bb3a9e6df

Change-Id: I9919e1a37853290dc052a21267cea57ae2a0aacf
 2017-01-16 18:32:22 +00:00
Tao Bao
6bb3a9e6df Merge "RecoverySystem: Fix the issue in installPackage()." 
am: 3b2fe9f7b9

Change-Id: I2ac84a2204b78e422d33095a3637e379031eec04
 2017-01-16 18:27:39 +00:00
Tao Bao
3b2fe9f7b9 Merge "RecoverySystem: Fix the issue in installPackage()." 2017-01-16 18:19:25 +00:00
Martijn Coenen
714c8596ad Merge "Add nullable parameter to readEmbeddedBuffer." am: c5e5442acd 
am: b529858c0b

Change-Id: I4a04a1e766551d0c15e3b4c14226363c97daf032
 2017-01-16 15:01:31 +00:00
Martijn Coenen
b529858c0b Merge "Add nullable parameter to readEmbeddedBuffer." 
am: c5e5442acd

Change-Id: Ic5d73aba5da7bd74522a46d710465ebb67030d01
 2017-01-16 14:56:57 +00:00
Tao Bao
9f7a0acd2d RecoverySystem: Fix the issue in installPackage(). 
Commit 794c8b0b3f fixed the race condition
when requesting data wipes via uncrypt. We have similar issue with
RecoverySystem.installPackage(). It first requests to set up the BCB,
then triggers a reboot. These two steps should finish atomically.

This CL switches to calling
RecoverySystemService.rebootRecoveryWithCommand(), which guards the two
steps with synchronized blocks.

Bug: 34239871
Test: Having two apps: one calls RecoverySystem.cancelScheduledUpdate()
      continuously, and the other calls RecoverySystem.installPackage()
      just once. The install request should not be cancelled by the
      other.

Change-Id: I5ec56fcaa70eae7c33e3cc8e6cfc7472b935ce4e
 2017-01-13 09:59:38 -08:00
Andrew Scull
9af145dcc4 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 
am: 3aac3ebee1

Change-Id: Idf677426c40799b17d08e0a8ac7dfafc2f2609b2
 2017-01-13 17:54:22 +00:00
Andrew Scull
3aac3ebee1 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev 
am: eb35ad9969

Change-Id: I4fd9ce4c79db5a10f28008c89205fc9c8ef2888f
 2017-01-13 17:17:49 +00:00
Andrew Scull
eb35ad9969 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev 
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
 2017-01-13 15:28:36 +00:00
Martijn Coenen
14fae06b60 Add nullable parameter to readEmbeddedBuffer. 
To support reading embedded buffers that can be
nullptr (currently only in empty hidl_vec).

Bug: 34255213
Test: hidl_test_java
Change-Id: I72028f580b7863b6bfeb31a5c0f43deed36dfd64
 2017-01-13 14:17:12 +01:00
Andrew Scull
ad4aa1ce7d resolve merge conflicts of e4cefbf4fc to nyc-dr1-dev 
Change-Id: Ib536a33ba381c28397320edd516d52727e5bdacc
 2017-01-13 13:16:09 +00:00
Philip P. Moltmann
764a7901e6 Do not write if apply() did not change the file. am: 1f99f81bdc 
am: 331a4bb8d4

Change-Id: I068dcbfcdaffff85379d422a9c53aafe7caa01c2
 2017-01-13 01:17:30 +00:00
Philip P. Moltmann
0aa5138861 Only persist last Shared Preferences state am: d15c4f1da5 
am: 889a420a9e

Change-Id: If0849eedacedf9197e19616dc56edad2ca39f015
 2017-01-13 01:16:23 +00:00
Philip P. Moltmann
331a4bb8d4 Do not write if apply() did not change the file. 
am: 1f99f81bdc

Change-Id: I4dd94b4f862f6c3d5ada9961d75cc2f91886edf1
 2017-01-13 01:10:01 +00:00
Philip P. Moltmann
889a420a9e Only persist last Shared Preferences state 
am: d15c4f1da5

Change-Id: I6431d4b7d07064eec5013d01b5bda76b1ed35e14
 2017-01-13 01:09:03 +00:00
Philip P. Moltmann
1f99f81bdc Do not write if apply() did not change the file. 
Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
 2017-01-12 16:43:30 -08:00
Philip P. Moltmann
d15c4f1da5 Only persist last Shared Preferences state 
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.

For commit() we need to make sure that we have at least persisted the
state of the commit.

Generation counts are 64 bit, hence they never overflow.

Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit 31d6889f4c)
 2017-01-12 16:42:59 -08:00
Andrew Scull
e4cefbf4fc Don't save password metrics to disk. 
On FBE devices, don't save the metrics to disk but compute them when the
password is first entered and only store them in RAM.

Merged-in: 5daf273b7e
Bug: 32793550
Change-Id: Icee7f615167761177b224b342970a36c7d90f6ba
 2017-01-12 16:01:59 +00:00
Etan Cohen
b32dfa4ef5 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 
am: 2a4e3bef2c

Change-Id: I6f894d92451032657678639c3021eef07289a6a2
 2017-01-11 23:17:19 +00:00
Etan Cohen
2a4e3bef2c Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" 
am: dfe8f5dc13

Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42
 2017-01-11 23:12:16 +00:00
Etan Cohen
dfe8f5dc13 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" 2017-01-11 22:59:25 +00:00
Jeremy Joslin
ab9eb11e2f Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 
am: 425a0fdc95

Change-Id: Icd1e76d7987cc9937cce5079dedf610fcd21c903
 2017-01-11 19:59:27 +00:00
Jeremy Joslin
425a0fdc95 Merge "Move getActiveScorerPackage() to the score service." 
am: b5488ec3b3

Change-Id: I8819c482a87a8c78ad0a1a39dda74b5ee2e7da4c
 2017-01-11 19:52:37 +00:00
Treehugger Robot
b5488ec3b3 Merge "Move getActiveScorerPackage() to the score service." 2017-01-11 19:40:45 +00:00
Etan Cohen
6a4b323f08 [AWARE] Unhide Wi-Fi Aware API (baseline) 
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).

Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
 2017-01-11 11:13:26 -08:00
Mark Salyzyn
ef8ccc8510 Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 
am: 6143cbf1e5

Change-Id: Id192d8dd973fe9e70acab72bae9856bc8a62ac75
 2017-01-11 15:40:24 +00:00
Mark Salyzyn
6143cbf1e5 Merge "Replace cutils/log.h and log/logger.h with log/log.h" 
am: e7fcbcb991

Change-Id: I13ddcd1826ce3df02a6c95875b9fa981c238ca08
 2017-01-11 15:35:19 +00:00
Mark Salyzyn
e7fcbcb991 Merge "Replace cutils/log.h and log/logger.h with log/log.h" 2017-01-11 15:24:11 +00:00
Neil Fuller
43d53395dc Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 
am: f4e236c794

Change-Id: If23b5efe912c5b0a76487c46723288ff6a903a14
 2017-01-11 13:48:14 +00:00
Neil Fuller
f4e236c794 Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" 
am: 649a89e524

Change-Id: Ib8dc0ec183b870931bf4befea5ff32532009fddd
 2017-01-11 13:37:37 +00:00
Neil Fuller
649a89e524 Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" 2017-01-11 13:27:10 +00:00
Tamas Berghammer
cbd3f0c59a Update package names to work with the proto3 compiler 
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 383db5ebcc)
 2017-01-11 11:27:38 +00:00
Andreas Gampe
e4cff36099 Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5 
am: 140b9b65a1

Change-Id: Ib4c46887ed5d87ef143bd866320d77b75d8711a3
 2017-01-11 02:46:57 +00:00
Andreas Gampe
140b9b65a1 Merge "Zygote: Add fdsToIgnore" 
am: 5b22a826d5

Change-Id: I458e354acf620cb434de41790ce94b814ff0a4ea
 2017-01-11 02:33:05 +00:00
Treehugger Robot
5b22a826d5 Merge "Zygote: Add fdsToIgnore" 2017-01-11 02:20:37 +00:00