Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
281,647 Commits 3 Branches 0 Tags
27089aadfbc4e752e7a22d6ddfa34166fb6f260a
Commit Graph

62748 Commits

Author SHA1 Message Date
Jeremy Klein
27089aadfb DO NOT MERGE: Add a null check for the OnStartTetheringCallback. 
This avoids a NullPointerException when trying to call the callback
and gives a more readable error message.

(cherry picked from commit 5f277e1667)

(cherry picked from commit c8e4cc8e99)

Change-Id: Ia5f328c4b25aa6624dc3c8493eb0c7bbab99904c
 2017-01-18 19:08:14 +09:00
Erik Kline
e9e251fcfb DO NOT MERGE: Support timeouts for requestNetwork() invocations. 
(cherry-pick of 06c3ef1367)
(cherry picked from commit 57faba9ec7)

Bug: 21414325

(cherry picked from commit 3841a48d0a)

Change-Id: I640c43315a071ecbf881e5ce898164915e0b787f
 2017-01-18 19:07:33 +09:00
Lorenzo Colitti
bb79257dbf Merge "Delete dead code." am: cf59ff79c5 am: d305a7c894 
am: 8cf7169564

Change-Id: Ia662fd845fcfb4ade631d8aacf6bcff3c92a1543
 2017-01-17 06:08:28 +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
448716eec1 Merge "RecoverySystem: Fix the issue in installPackage()." am: 3b2fe9f7b9 am: 6bb3a9e6df 
am: 5c610492c8

Change-Id: Ic9fa3bb8c7d4c04fa6e55b600cd7cccc9b186db1
 2017-01-16 18:36:43 +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
098bbc455d Merge "Add nullable parameter to readEmbeddedBuffer." am: c5e5442acd am: b529858c0b 
am: 714c8596ad

Change-Id: I792c4ac6a20e4665b152a5ebea1227b549cca7ef
 2017-01-16 15:06:01 +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
Jesse Hall
17ee3aac28 Create GraphicsEnvironment for communicating with driver loaders 
The GraphicsEnvironment class is given information during application
start, and makes it available to EGL/GLES/Vulkan loaders that don't
have easy access to the VM or to the application Context. Currently
only the driver path is handled, but the existing support for setting
library paths (for Vulkan extensions) and cache directory information
should move here.

Bug: 33531483
Test: various apps w/ and w/o driver package installed
Change-Id: I5820d3d1301d5461e10706f551b268c54d4f8926
(cherry picked from commit b12249b671)
 2017-01-15 05:55:46 +00:00
Chris Craik
2369a6d753 Support shadows and reordering in ViewOverlay 
am: 36d9a6dfba

Change-Id: I1e7c33d68b5e2350b8b0ac589c46fdc250424b1a
 2017-01-13 22:07:43 +00:00
Andrew Scull
8203155664 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 
am: 3c9b36482f

Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13
 2017-01-13 21:23:27 +00:00
Andrew Scull
3c9b36482f resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 
am: 3aac3ebee1

Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a
 2017-01-13 21:16:31 +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
Chris Craik
36d9a6dfba Support shadows and reordering in ViewOverlay 
Bug: 32726440
Test: manual
Change-Id: Ic5d7efdee5a493b7768b9db8150f65f97b3f0a64
 2017-01-12 19:17:19 -08: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
3fc5b186fa Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c 
am: b32dfa4ef5

Change-Id: If2a6b632cd03984921572b190745865953a8e808
 2017-01-11 23:22:51 +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
Felipe Leme
c88368c270 Added BUGREPORT_OPTION_TELEPHONY. 
am: a561b1f9c0

Change-Id: I063a0d6c4c66035082789d4361b649439da00bf9
 2017-01-11 23:09:01 +00:00
Etan Cohen
dfe8f5dc13 Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" 2017-01-11 22:59:25 +00:00
TreeHugger Robot
2729bb8517 Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev 2017-01-11 22:55:38 +00:00
Jeremy Joslin
ad9ff9c59a Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95 
am: ab9eb11e2f

Change-Id: Iede47bf5a625ac4183919b4253c6d5e3f92520bc
 2017-01-11 20:08:49 +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
082a1721b5 Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5 
am: ef8ccc8510

Change-Id: If6673f44c7d08960f3a0a86703cebf577bd21f1b
 2017-01-11 15:45:46 +00: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
75f84f2261 Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794 
am: 43d53395dc

Change-Id: Ib7055c5ddf2caa52082aee4b67e3ebd213e09e4b
 2017-01-11 13:54:10 +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