Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Naidis
fd55f834c8 Merge "DefaultPermissionGrantPolicy: Pass correct arguments" 
am: 0b325c6634

Change-Id: I5d217037bececb7a096ccfa018fafaa4280e4537
 2017-01-07 01:40:42 +00:00
Pavlin Radoslavov
afdf387e13 Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8 am: d190040dd1 
am: 8905569c67

Change-Id: I74b2606347e9b6e2a2424add4aa74d0db687f6ee
 2017-01-07 01:36:47 +00:00
Stefan Kuhne
643ba812eb Merge "Apps which do not support density cannot be resized" 2017-01-07 01:35:02 +00:00
Treehugger Robot
0b325c6634 Merge "DefaultPermissionGrantPolicy: Pass correct arguments" 2017-01-07 01:33:18 +00:00
Pavlin Radoslavov
8905569c67 Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8 
am: d190040dd1

Change-Id: I051932a98729e91f4e6512c9fa84a7e261b8cd96
 2017-01-07 01:29:44 +00:00
Pavlin Radoslavov
d190040dd1 Merge "Add Bluetooth Codec selection UI to the Developer Options" 
am: bfd7f9a1f8

Change-Id: I0cc5f64f292a56e6301b294974c1bd3cc72664c0
 2017-01-07 01:25:34 +00:00
Alison Cichowlas
803054dccb Log wrapper for multi-metrics in tron. 
Test: Added new LogBuilderTest; runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/logging/LogBuilderTest.java

new file:   core/java/com/android/internal/logging/LogWrapper.java

Change-Id: I8c64a07b95ab9a70f39663d4ec54f9ec1bf49063
 2017-01-06 20:24:16 -05:00
Treehugger Robot
bfd7f9a1f8 Merge "Add Bluetooth Codec selection UI to the Developer Options" 2017-01-07 01:19:33 +00:00
Adam Lesinski
06d3e8fec7 libandroidfw: Revert null check in ApplyStyle 
The out parameter `out_indices` is expected to be non-null
and so the extra null check adds a cost to performance
and opens the door to misusing the API by not supplying
`out_indices`.

Test: make libandroidfw_tests
Change-Id: Ie66fd837c5e24ec2838156e7b67f54c15cd27933
 2017-01-06 16:51:48 -08:00
Dmitry Dementyev
58fa836210 Implement Account Discovery API. 
Bug: https://b.corp.google.com/issues/33046496
Test: cts tests, manual tests.

Change-Id: I03d1ae5dfa1577f191817aa7d508f6b4d0e625ed
 2017-01-06 16:44:27 -08:00
Dave Friedman
2a3ebadcbe Docs: Updates Javadoc documentation. 
Bug: 32532540

Change-Id: Ia811d9a51812206b18b75a98f6c5a55b92627404
 2017-01-06 16:41:19 -08:00
Chris Craik
686d972e12 Fix NPE in RenderNodeAnimator ALPHA when used outside ViewPropertyAnimator 
Bug: 33797688
Test: new RenderNodeAnimatorTest passes

Other clients use RenderNodeAnimator now, so call
ensureTransformationInfo to be safe.

Change-Id: I837d6f5b00bb368d2bbf77b94d4c19a8426b9927
 2017-01-06 16:18:31 -08:00
Andrii Kulian
6fd63e4df6 Merge "Fix selecting focused stack with secondary displays" 2017-01-07 00:16:49 +00:00
Etan Cohen
b84ad8062d [AWARE] Remove reason from discovery session terminate callback 
Only valid reason is per request (destroy or timeout/count).

Bug: 32670068
Test: unit tests & integration tests (sl4a) passing
Change-Id: I85d417442e26a16d7f09d6d2d4cbb8ae7a9eba7e
 2017-01-06 16:07:41 -08:00
Etan Cohen
3de35a5e55 [AWARE] Simplify Wi-Fi Aware API namespace 
Simplify Wi-fi Aware API namespace. Rely on project and remove WifiAware
prefix from most classes.

(pure rename operation: no functional changes)

Bug: 31470256
Test: unit-tests + integration (sl4a) tests.
Change-Id: I38b8137c1730c8f40c482c6770caafcaeafd5c46
 2017-01-06 16:06:42 -08:00
Pavlin Radoslavov
60d704f841 Add Bluetooth Codec selection UI to the Developer Options 
Test: A2DP streaming to headsets and manual UI interaction
Bug: 30958229
Change-Id: I88f6efedf1c89b524c863543135ef7be9b7e1a7c
 2017-01-06 15:44:27 -08:00
Jeremy Joslin
5519d7cf71 Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED. 
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33752149
Change-Id: I7d91fa9a4f6ef4f9170c6af98567ce443c805e74
 2017-01-06 15:42:57 -08:00
Stephen Chen
32f73c0f4e Expose WifiManager#connect and ActionListener as @SystemApi 
This is needed by Wifi Wakeup and Notifications which live within
NetworkRecommendation package.

Bug: 33224871
Test: GTS
Change-Id: If4f1f9957f82b1292af4187c7728cbccab0184e8
 2017-01-06 15:34:28 -08:00
Ruchi Kandoi
eb2d14b81f Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev am: cb4f643b95 
am: f30c2860d1

Change-Id: Ie1eeb05332e670875704602c1a79ce17972a2e69
 2017-01-06 22:42:28 +00:00
Ruchi Kandoi
305e66ed34 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings. am: 3a1ff62e5a 
am: 8673349cc3

Change-Id: Ib860bb7431e679b5ba22b5c825e7f5ac34405780
 2017-01-06 22:41:15 +00:00
Jeremy Joslin
302d02b95b Make REQUEST_NETWORK_SCORES signature only. 
There are no use cases where it's needed by a privileged app today.

Test: Built and ran
BUG: 33752149
Change-Id: Iae689e878fdb60b506536c918079a4fcff527a71
 2017-01-06 14:38:57 -08:00
Ruchi Kandoi
f30c2860d1 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev 
am: cb4f643b95

Change-Id: I36d7312e2e9c6a121b3297c298d4e32867c7d84a
 2017-01-06 22:24:54 +00:00
Ruchi Kandoi
8673349cc3 nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings. 
am: 3a1ff62e5a

Change-Id: I1fbc203c2becededcbc8e9d873ff89244c52b7ba
 2017-01-06 22:24:46 +00:00
Alex Naidis
f030a28a6b DefaultPermissionGrantPolicy: Pass correct arguments 
After parsing the xml files in the "default-permissions"
system, we are passing the arguments in the wrong order.

The method we are targeting is:
private void grantRuntimePermissionsLPw(PackageParser.Package pkg, Set<String> permissions,
            boolean systemFixed, boolean isDefaultPhoneOrSms, int userId) {

However we are passing our argument for "systemFixed"
to "isDefaultPhoneOrSms" and the other way around too.

This patch fixes it by using the version of the method
which takes 4 arguments and sets "isDefaultPhoneOrSms"
as false.

Change-Id: I3604a5d6045aadcd91b6dd3f6f1b47b561403b23
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
 2017-01-06 22:21:24 +00:00
Tomasz Wasilczyk
8c8863d7aa Make metadata field mandatory for program info struct. 
Test: VTS, manual
Change-Id: I2630e246eba3980ae6517d92cab3a9fc55d8d7b4
 2017-01-06 14:18:34 -08:00
TreeHugger Robot
cb4f643b95 Merge "nfc: Adds NFC_PAYMENT_DEFAULT_COMPONENT to the backed up settings." into nyc-mr2-dev 2017-01-06 22:18:26 +00:00
Peter Qiu
90eb89ed06 wifi: hotspot2: Passpoint configuration APIs update 
- renamed addPasspointConfiguration to addOrUpdatePasspointConfiguration
  to match the implementation of the API
- updated getPasspointConfigurations to return an empty list instead of
  a null when no configuration is installled

Bug: 33587910
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Id40185edb08910c01454c44b77957e2d5c0df722
 2017-01-06 14:06:52 -08:00
Fyodor Kupolov
51d34bf06a Merge "Always use multi-dex for FrameworksServiceTests" 2017-01-06 21:45:11 +00:00
Fyodor Kupolov
c0c1123124 Always use multi-dex for FrameworksServiceTests 
Otherwise it exceeds ids limit:
ERROR: Dex writing phase: classes.dex has too many IDs. Try using multi-dex

Test: manual - device builds, tests are running
Change-Id: I042cd1b8cb8d41c8db055ba8c6ceb56eb592c30f
 2017-01-06 13:36:40 -08:00
Makoto Onuki
2e83edb4b0 Merge "Revert "ShortcutManager: Floating shortcuts shouldn't have target activities."" 2017-01-06 21:32:35 +00:00
TreeHugger Robot
03614f3fec Merge "Move category refresh call into a separeate method." 2017-01-06 21:27:52 +00:00
Ruben Brunk
70632e8cdd Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev am: 0d8c4765b2 
am: d6d006c087

Change-Id: I74bfe5a3cabb844839e136fc4b9fc6e83610fba1
 2017-01-06 21:23:47 +00:00
Ruben Brunk
7b95418bfe Fix unexpected VR mode exit on package update. am: 1ad4a2d32e 
am: 4e61a045e1

Change-Id: Ib5b02c1d27da030cf9f8e75328507b791d934cef
 2017-01-06 21:22:57 +00:00
Dan Albert
43c3ea4f16 Merge "Unversion NDK stub libraries." am: ddc7ac8ba6 am: e2b4d4a38a am: 22f0b9d1ae 
am: cf49a04ce6

Change-Id: Ia47164a731eea1bc93e9a1259b0d13127ec388cb
 2017-01-06 21:15:56 +00:00
Ruben Brunk
d6d006c087 Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev 
am: 0d8c4765b2

Change-Id: I709b8c9f3d6d32f3f71c2848716563a6b598d503
 2017-01-06 21:14:31 +00:00
Ruben Brunk
4e61a045e1 Fix unexpected VR mode exit on package update. 
am: 1ad4a2d32e

Change-Id: Ic0c025d3f360197dc41fe2b999b5d20763285cd5
 2017-01-06 21:14:27 +00:00
Dan Albert
cf49a04ce6 Merge "Unversion NDK stub libraries." am: ddc7ac8ba6 am: e2b4d4a38a 
am: 22f0b9d1ae

Change-Id: Ie6abad6c56a55cd67c22903cd9d60bd907d45e9b
 2017-01-06 21:10:51 +00:00
TreeHugger Robot
0d8c4765b2 Merge "Fix unexpected VR mode exit on package update." into nyc-mr2-dev 2017-01-06 21:07:29 +00:00
Andrew Sapperstein
9e6a9f5f46 Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev am: e553cebbeb 
am: ad11ecfbbc

Change-Id: Id1c49226eb459eacff6cc5a23b18a62cd3302960
 2017-01-06 21:04:16 +00:00
Andrew Sapperstein
27d2440ae4 Update CHAR LIMIT for notification body. am: 429cafb85e 
am: ddb2539508

Change-Id: I0aa9498f9669db6d55e5bacf5f23ae5b01ca3229
 2017-01-06 21:03:26 +00:00
Dan Albert
22f0b9d1ae Merge "Unversion NDK stub libraries." am: ddc7ac8ba6 
am: e2b4d4a38a

Change-Id: I57440577773e47f60e6af4e9112523b78741f9fa
 2017-01-06 21:03:24 +00:00
TreeHugger Robot
f51b4ff7b1 Merge "Make sure cleanup is always done when task is removed" 2017-01-06 21:00:19 +00:00
Andrew Sapperstein
ad11ecfbbc Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev 
am: e553cebbeb

Change-Id: I390db320ba7139dcc96f361ce4f850b8125482b9
 2017-01-06 20:57:12 +00:00
Andrew Sapperstein
ddb2539508 Update CHAR LIMIT for notification body. 
am: 429cafb85e

Change-Id: I2cfa08917ce4581d4119ba7a6e492874368cf957
 2017-01-06 20:57:05 +00:00
Julia Reynolds
aebfc4e7a3 Cannot have badge only channels 
Test: runtest systemui-notification & cts
Change-Id: I256e35a79400c1d25b3d2f1c7c5f8c513242a2aa
 2017-01-06 15:56:44 -05:00
Dan Albert
e2b4d4a38a Merge "Unversion NDK stub libraries." 
am: ddc7ac8ba6

Change-Id: I0cf382ae983796b948acfe84e1bb9b639de86a65
 2017-01-06 20:54:52 +00:00
TreeHugger Robot
e553cebbeb Merge "Update CHAR LIMIT for notification body." into nyc-mr2-dev 2017-01-06 20:46:28 +00:00
Treehugger Robot
ddc7ac8ba6 Merge "Unversion NDK stub libraries." 2017-01-06 20:44:19 +00:00
Sergei Vasilinetc
ab08c65533 Merge changes I68d56d76,Iad432577 
* changes:
  Hidden method to get a graphic buffer from a hardware bitmap
  Move GraphicBuffer to graphics package
 2017-01-06 20:36:41 +00:00
Andrew Sapperstein
5453d0c251 Add temperature config for high temp warning. am: 1cac83218c 
am: fcf6cc3062

Change-Id: I403b58b478197bff8d6da19331976a71c5b8dafd
 2017-01-06 20:12:01 +00:00