Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
280,674 Commits 3 Branches 0 Tags
2518cfcc595f77014ece27f94cbcc24623da9120
Commit Graph

68738 Commits

Author SHA1 Message Date
Charles He
fce4eb6810 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 am: 08ea823955 
am: 065e387455

Change-Id: Ic6182836cbc0bf547bcd6c6621a410c1e6d0ce8f
 2016-12-29 11:23:57 +00:00
Charles He
065e387455 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446 
am: 08ea823955

Change-Id: I079501cac553468878a6642a64110f4de3e56698
 2016-12-29 11:16:55 +00:00
Charles He
08ea823955 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad 
am: 9bc2d6b446

Change-Id: I7e5794885bf78dfd1d755a7fdb0b1edf66b9fdee
 2016-12-29 11:03:26 +00:00
Charles He
9bc2d6b446 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f 
am: dd7837c5ad

Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce
 2016-12-29 10:55:23 +00:00
Charles He
dd7837c5ad Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 
am: 8bcdab7e6f

Change-Id: I6e41bfad4ce66ca80bca636a5fb4ddc85b71e83a
 2016-12-29 10:41:25 +00:00
Charles He
8bcdab7e6f Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 
am: 9a47fa7fc0

Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074
 2016-12-29 10:34:04 +00:00
Charles He
9a47fa7fc0 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 
am: e5156ec1e9

Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da
 2016-12-29 10:25:50 +00:00
Charles He
e5156ec1e9 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 
am: 00a581f882

Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
 2016-12-29 10:18:49 +00:00
Charles He
00a581f882 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d 
am: 133ff4d611

Change-Id: I54b163f645f561243aac3df1a55c1023531997b3
 2016-12-29 10:11:20 +00:00
Charles He
133ff4d611 Prevent writing to FRP partition during factory reset. am: a9437bd1ca 
am: 2ce5c4320d

Change-Id: I29339a634fd22cd46bfc08619464da8fe159a2b7
 2016-12-29 10:03:53 +00:00
Charles He
2ce5c4320d Prevent writing to FRP partition during factory reset. 
am: a9437bd1ca

Change-Id: Ib0b8db2357317dc3e680910c08f15f098baf2af9
 2016-12-29 09:48:45 +00:00
Martijn Coenen
c052e6c67f Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 am: 010d0be575 
am: 1f8c96ca7f

Change-Id: Ic195a1f3ab2a9d318fe667ac3be0ce166119dc66
 2016-12-29 09:19:55 +00:00
Martijn Coenen
1f8c96ca7f Merge "Add (un)linkToDeath support to HwBinder." am: 7705363166 
am: 010d0be575

Change-Id: Ibabccaf8555bd0229add18a798bff685c6a1c433
 2016-12-29 09:12:22 +00:00
Martijn Coenen
010d0be575 Merge "Add (un)linkToDeath support to HwBinder." 
am: 7705363166

Change-Id: I007b2fc2982d164176607cd8f2d0ccc9ebde982c
 2016-12-29 09:04:49 +00:00
Martijn Coenen
727f7bf84f Add (un)linkToDeath support to HwBinder. 
This is mostly copied over from binder's existing
death recipient support. The implementation keeps
a list of registered recipients, both for being
able to map a native recipient back to the corresponding
Java recipient, as well as being able to unregister
recipients correctly.

Test: mma, hidl_test_java
Bug: 31632518
Change-Id: Id313fd248be6925056c4ade8298fe5fb04e007cc
 2016-12-29 04:22:30 +00:00
ashutoshj
3659363d06 Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 
am: cf33fd7910

Change-Id: Ic9daa912077d6162092a0adcb5d8debf10be9c55
 2016-12-29 01:52:34 +00:00
ashutoshj
cf33fd7910 Merge "Change the name of the contexthub service." am: fba752e64c 
am: 8a3f7c0738

Change-Id: I02265e27f7245a13cdfc705dba4cd4de33ed0253
 2016-12-29 01:45:34 +00:00
ashutoshj
8a3f7c0738 Merge "Change the name of the contexthub service." 
am: fba752e64c

Change-Id: Ie354f06495f0c3fb73aa053956ecc371716bab3f
 2016-12-29 01:38:30 +00:00
Ashutosh Joshi
835da289fa Change the name of the contexthub service. 
Change the name used by the contexthub service. Specifically, this
change switches from using the "ContexthubService.CONTEXTHUB_SERVICE"
constant to using the "Context.CONTEXTHUB_SERVICE" constant- which is in
line with the other Android services.

Merged-In: I18ae73ed0fda2f938e3233670dc52b5692d321ae
Test: GTS tests pass.

Change-Id: I18ae73ed0fda2f938e3233670dc52b5692d321ae
 2016-12-28 13:57:27 -08:00
Selim Cinek
7e5cff0167 DO NOT MERGE Revert "Add Brightness setting for VR Mode." 
am: 966045d070

Change-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9
 2016-12-27 19:22:04 +00:00
TreeHugger Robot
cbb057d3da Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev 2016-12-27 19:08:59 +00:00
Selim Cinek
966045d070 DO NOT MERGE Revert "Add Brightness setting for VR Mode." 
This reverts commit 84980c7a93.

Bug: 33895226
Bug: 30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
 2016-12-27 18:28:40 +00:00
Santos Cordon
84334e25cd Add Brightness setting for VR Mode. 
am: 84980c7a93

Change-Id: I4a9c3db7bdf73e673cf8b2409404339df94086c2
 2016-12-22 23:58:05 +00:00
Santos Cordon
cfdf27f24b Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev 2016-12-22 23:49:20 +00:00
Santos Cordon
84980c7a93 Add Brightness setting for VR Mode. 
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.

Bug: 30984614
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
 2016-12-22 23:26:49 +00:00
pkanwar
21f8870abc DO NOT MERGE: Add UI toggle to control connections to carrier networks. 
am: 57f383709b

Change-Id: Ieb3aa3a0755bcd16759d91852980bcdf5373eaa8
 2016-12-22 20:53:58 +00:00
Pankaj Kanwar
f6d8e1f635 Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev 2016-12-22 20:41:58 +00:00
Sundeep Ghuman
4ac2f9f53e Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02 am: 41577a0029 
am: bfc0bfe645

Change-Id: Ia3d455791e3f219a3e0cff3b6946184757487d71
 2016-12-22 19:26:05 +00:00
Sundeep Ghuman
bfc0bfe645 Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02 
am: 41577a0029

Change-Id: I7807d92a705a8ec9d9c7b04159e1cd2290846e38
 2016-12-22 19:14:48 +00:00
pkanwar
57f383709b DO NOT MERGE: Add UI toggle to control connections to carrier networks. 
Bug: 31003437
Change-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da
 2016-12-22 11:12:02 -08:00
Alex Klyubin
a9888fc0c4 resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893 
am: b824658494

Change-Id: Ic1dd2aef96889f0f68a55093cfb04b4d90f34818
 2016-12-22 19:06:09 +00:00
Sundeep Ghuman
41577a0029 Merge "Cherrypick: Define the calculateRankingScore method and Key." 
am: 425af45d02

Change-Id: Ib61f91087967f1b026cd2ba77175ccf47943bc53
 2016-12-22 19:04:22 +00:00
Alex Klyubin
b824658494 resolve merge conflicts of febd982 to stage-aosp-master 
am: 5c53fdb893

Change-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7
 2016-12-22 19:01:13 +00:00
Alex Klyubin
5c53fdb893 resolve merge conflicts of febd982 to stage-aosp-master 
Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937
 2016-12-22 10:20:23 -08:00
Treehugger Robot
425af45d02 Merge "Cherrypick: Define the calculateRankingScore method and Key." 2016-12-22 00:03:57 +00:00
Sundeep Ghuman
0d79bdef27 Cherrypick: Define the calculateRankingScore method and Key. 
Define the key to be used to store the rankingScoreOffset inside the
ScoredNetwork bundle. Implement a platform API method to calculate the
ranking score for a given rssi.

OCL: ag/1688711

Bug: 33049302
Test: Unit tests
Change-Id: Ia3fea2197d7c211a2313fced8713d79d8d5f4f6e
Merged-In: Ia3fea2197d7c211a2313fced8713d79d8d5f4f6e
Topic: ScoredNetworkRankingScore
 2016-12-21 13:57:24 -08:00
Jeff Sharkey
febd982cdd Merge "Avoid Calendar's unexpect change in snapToCycleDay()" 2016-12-21 21:11:20 +00:00
Amin Shaikh
9926363b09 Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac am: a3943850ab 
am: 471093b58e

Change-Id: I129d3abd329d9e00de1177ca39cf3ce0ff06946b
 2016-12-21 20:10:30 +00:00
Amin Shaikh
471093b58e Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac 
am: a3943850ab

Change-Id: Id763d2f82e10dd5843258ef09d0e65824e2c2de6
 2016-12-21 20:02:03 +00:00
Amin Shaikh
a3943850ab Merge "Expose ScanResult#untrusted as a @SystemApi." 
am: a93e57f1ac

Change-Id: I9cac16dbceb36d6ff72e92d2ab8de20bd8d70e36
 2016-12-21 19:56:19 +00:00
Amin Shaikh
3d18c621cb Expose ScanResult#untrusted as a @SystemApi. 
- Expose ScanResult#untrusted to inform NetworkRecommendationProviders
  that a ScanResult does not correspond to a saved network.
- Add static construction methods and assertions to RecommendationResult

Test: runtest frameworks-services

Bug: 33490132
Change-Id: If7006040f63843c1c468c9d95c5c017383c5c5dd
Merged-In: If7006040f63843c1c468c9d95c5c017383c5c5dd
 2016-12-21 11:46:22 -08:00
Shunta Sato
d18ffd8223 Avoid Calendar's unexpect change in snapToCycleDay() 
Symptom:
Calendar object's certain field is unexpectedly changed after
using Calendar.add() method.

Detail and sample:
Following patch causes this issue.
- Switch network cycle calculation to use Calendar.
  https://android.googlesource.com/platform/frameworks/base/+/f2bead5

Call of Calendar.add() method might make a smaller field value
invariant. The smaller field means such a field of
Calendar.HOUR_OF_DAY, Calendar.MINUTE, Calendar.SECOND and so on
if Calendar.MONTH field is focused.
According to above, sometimes correct Calendar value won't be
acquired by original code.
To avoid unexpected change, it requires initialization toward
each smaller field after Calendar.add() call.

Solutions:
Calendar.DAY_OF_MONTH, Calendar.HOUR_OF_DAY, Calendar.MINUTE,
and Calendar.SECOND fields is set to 0 after added value to
Calendar.MONTH field.

Bug: 32724903
Author: Shigeki Yokomichi <shigeki.x.yokomichi@sonymobile.com>
Change-Id: I7af6391653be21786b662b2f8eaad10c413733c1
 2016-12-21 12:44:30 -07:00
Calin Juravle
5be781d874 Merge "Report non-primary dex files loads to PM" am: f23ea2ca62 am: 78b3889804 
am: 9947e79b26

Change-Id: I8ddb7756c0690584343cb026a298bc5f0b8d4e27
 2016-12-21 10:14:42 +00:00
Calin Juravle
9947e79b26 Merge "Report non-primary dex files loads to PM" am: f23ea2ca62 
am: 78b3889804

Change-Id: Iaf17def2729170403fa61ce0e09ced4675a47191
 2016-12-21 10:09:45 +00:00
Calin Juravle
78b3889804 Merge "Report non-primary dex files loads to PM" 
am: f23ea2ca62

Change-Id: I5eb9f8c8bc7e66c074adb95ad5dfec412cec539c
 2016-12-21 10:04:39 +00:00
Calin Juravle
f23ea2ca62 Merge "Report non-primary dex files loads to PM" 2016-12-21 09:57:41 +00:00
Alex Klyubin
9c280d1566 Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26 am: be81b50b6e 
am: e1bc33228e

Change-Id: I80c703f7784436414263fb86f56b7c85a6da40e7
 2016-12-20 21:05:15 +00:00
Alex Klyubin
e1bc33228e Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26 
am: be81b50b6e

Change-Id: I1275903e7fda6bdd9c1012bc7cfb6c42f6b43304
 2016-12-20 20:45:59 +00:00
phweiss
dee7669fd2 DO NOT MERGE Show notification when network logging is enabled 
am: 923d2cc9d9

Change-Id: Ia5839248361a7d7fbb0c73cdb569ada62a96c286
 2016-12-20 20:01:33 +00:00
Alex Klyubin
be81b50b6e Merge "Permit 65535 byte ZIP comments and empty Central Directory" 
am: f420b91e26

Change-Id: Ic178cdd9043c171f2f51643212e34b642657abe9
 2016-12-20 18:45:57 +00:00