Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
276,304 Commits 3 Branches 0 Tags
808bd1765fca17fbcd161e92cc7c225ae768ee97
Commit Graph

62004 Commits

Author SHA1 Message Date
Andreas Huber
8bd63a39f3 Merge "Adds support for specifying the version of a service to register/lookup." 
am: c3d8550cf3

Change-Id: I6b12021c6100f33de7f4b4702bdb4bf1a48c0259
 2016-10-26 15:49:52 +00:00
Andreas Huber
c3d8550cf3 Merge "Adds support for specifying the version of a service to register/lookup." 2016-10-26 15:38:45 +00:00
Jakub Pawlowski
f169ecb76f Merge "Add helper method to convert Bluetooth UUID to bytes" 
am: 8a0a58b218

Change-Id: I829135e559a9c3cf3c942258a16acee62c37c3ac
 2016-10-25 21:47:35 +00:00
Andreas Huber
35eb7994f8 Adds support for specifying the version of a service to register/lookup. 
Bug: 32405011
Test: hidl_test_java
Change-Id: I91a31cafa68d570c67f9a1aa7efb9d3dcb35e591
 2016-10-25 13:35:44 -07:00
Jakub Pawlowski
f67ee83a22 Add helper method to convert Bluetooth UUID to bytes 
Bug: 30622771
Test: sl4a ConcurrentBleAdvertisingTest
Change-Id: I7f646d1d357c51b82efc504a0e65d868ad363ddb
 2016-10-25 12:30:24 -07:00
Robert Sesek
f80fab010a Merge "Create the WebViewZygote and implement WebViewZygoteInit." 
am: 8be2850546

Change-Id: I608ea53be52cb91f0e8cf73998de4578b39e099a
 2016-10-22 03:12:18 +00:00
Treehugger Robot
8be2850546 Merge "Create the WebViewZygote and implement WebViewZygoteInit." 2016-10-22 03:03:10 +00:00
Yin-Chia Yeh
50f9b6e71f Merge "Camera2 Legacy: catch more surface abandoned error" 
am: 03f14bef41

Change-Id: If2e05eeb8c7fe24f97fc0c5e20bfe03a6c8c9e23
 2016-10-21 21:07:44 +00:00
Yin-Chia Yeh
091661334b Camera2 Legacy: catch more surface abandoned error 
Bug: 30140107
Change-Id: Ia293bdbb85c8078e17def55db9c599cfe70458db
 2016-10-21 11:40:46 -07:00
Jacky Cheung
046a5c3a00 Merge "Gradually increase the level of authentication on failed GATT operations." 
am: 6071abdb92

Change-Id: If06babf4a23879acdfc358838cdc094d753c362b
 2016-10-20 23:03:57 +00:00
Jacky Cheung
3854e22674 Gradually increase the level of authentication on failed GATT operations. 
When lower layer returns insufficient authentication or insufficient
encryption on various GATT operations, gradually retry with increased
authentication level first to AUTHENTICATION_NO_MITM, then
AUTHENTICATION_MITM.

Test: ported from internal branch.

Change-Id: I6bcc4198ca493b7900ddd166a81d30cde896fa86
 2016-10-20 13:59:04 -07:00
Andreas Huber
abfd527d09 Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on" 
am: 2202b164d8

Change-Id: I43bec2c6d3e6e4201f7a50981f428ef00f384684
 2016-10-19 19:39:03 +00:00
Christopher Wiley
c6e72b30c7 Merge "Use this.isUp() inside InterfaceConfiguration" 
am: 239df3cc5a

Change-Id: Id6f064d7a74e41d757de2499653671fc830d217b
 2016-10-19 19:31:57 +00:00
Andreas Huber
2202b164d8 Merge "HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on" 2016-10-19 19:30:29 +00:00
Treehugger Robot
239df3cc5a Merge "Use this.isUp() inside InterfaceConfiguration" 2016-10-19 19:15:31 +00:00
Andreas Huber
ef1a565bd4 HIDL Vectors are now exposed to Java as ArrayList<T>, the supporting APIs on 
HwParcel now reflect this change.

Bug: 32237331
Test: hidl_test_java
Change-Id: Ia1ce5a4e3acedd8ebcff15107aea53ce28fde589
 2016-10-18 09:36:02 -07:00
Sanket Agarwal
086be31642 Merge "Remove APIs that are not directly usable." 
am: 9cff57312d

Change-Id: I1234db97ed82017ed3bca02e10818a53fdc33d3d
 2016-10-17 21:28:05 +00:00
Sanket Agarwal
fb6322425a Remove APIs that are not directly usable. 
The right way to expose this API is done via MediaBrowser.

Bug: b/28791287
Change-Id: I0a8a185934fd7aaa9f2b5eac7398955fa380060f
(cherry picked from commit b5fbb75aa2)
 2016-10-17 12:47:10 -07:00
Christopher Wiley
87100cce39 Use this.isUp() inside InterfaceConfiguration 
Bug: 31337216
Test: Compiles
Change-Id: I968a739f9ada47b1357932d2da76451eb26c3d5f
 2016-10-17 10:32:40 -07:00
Christopher Wiley
281d7490bf Merge "Add InterfaceConfiguration.isUp()" 
am: c7ea99a63c

Change-Id: Id0bc63c82f8ffd6ad411769ab012efd8bbdfa3ce
 2016-10-17 16:41:52 +00:00
Robert Sesek
856a791ddd Merge "resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-10-14 14:08:00 +00:00
Michal Karpinski
fd0d22750f Don't expose default strong auth timeout as constant am: 6dbf67fc48 
am: bc755da55c

Change-Id: Idb118df5cf1a763645f4187bcddfa4bb9b8b42ee
 2016-10-13 23:00:24 +00:00
Michal Karpinski
bc755da55c Don't expose default strong auth timeout as constant 
am: 6dbf67fc48

Change-Id: Iacbe9a2de7024e29e9c2c98594ebca828b855a43
 2016-10-13 22:52:38 +00:00
Christopher Tate
86208efdc9 Only full-data back up regular files + directories am: da2018efeb 
am: 0d816b8f69

Change-Id: I3b28c373c58ebebf27b1297e770d2023767e6396
 2016-10-13 21:17:09 +00:00
Christopher Tate
0d816b8f69 Only full-data back up regular files + directories 
am: da2018efeb

Change-Id: I6ecc74ee9613f221e24acca571560bf8190b7073
 2016-10-13 21:13:00 +00:00
Greg Plesur
43ed3a5b6a DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade. 
am: 3514404984

Change-Id: I8d24007831ba030af0d84f717802c79172db970f
 2016-10-13 21:12:51 +00:00
Greg Plesur
216ee1f0e7 Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return 'false' for Wear devices after pairing/upgrade." into cw-f-dev 2016-10-13 21:02:01 +00:00
Robert Sesek
aa3c463a5b resolve merge conflicts of 0b58f19 to nyc-mr1-dev-plus-aosp 
Change-Id: I374d842cab49b58b570d5ad7ef3dffb7b148d236
 2016-10-13 16:49:47 -04:00
Dianne Hackborn
50468217c4 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle am: 851ec49de7 
am: 9774ea3646

Change-Id: I7e27381f7fa4ca8770ca06cdc6c0bdd18a549ae2
 2016-10-13 20:38:04 +00:00
Dianne Hackborn
9774ea3646 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle 
am: 851ec49de7

Change-Id: I8a5f8e28f8e4ca7e8fd20abacc0da1dae4055da7
 2016-10-13 20:31:43 +00:00
Christopher Tate
da2018efeb Only full-data back up regular files + directories 
Ignore every filesystem entity that is not a regular file or directory.
In particular, we now ignore not only symlinks but also sockets, pipes,
et cetera.

Bug 32143362

Change-Id: If51b54df1f7a643af145eb15bf12d389d19f8780
 2016-10-13 12:19:45 -07:00
Greg Plesur
3514404984 DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should 
return 'false' for Wear devices after pairing/upgrade.

BUG: 32019375
Change-Id: I2563efe58c98c5dd8440891e478c89e093d8d9ac
 2016-10-13 15:08:14 -04:00
Dianne Hackborn
851ec49de7 Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle 
We now recursively generate new Bundle objects if we need to
do any stripping.

Change-Id: I4ca7896a0771c25264591ae7c79df85816d630d4
 2016-10-12 18:17:58 -07:00
Adrian Roos
7bc84b803d Fix Notification.Action.Builder copy constructor am: 7af5362571 
am: 342bc437bf

Change-Id: I0387ab66ec3d44e34a884fb2f92f32af35e2883c
 2016-10-12 23:25:20 +00:00
Adrian Roos
342bc437bf Fix Notification.Action.Builder copy constructor 
am: 7af5362571

Change-Id: I0853e663b1895e2c45fad17cfee79202f3b14ef7
 2016-10-12 23:19:19 +00:00
TreeHugger Robot
5c8fc58850 Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev 2016-10-12 23:11:22 +00:00
Adrian Roos
7af5362571 Fix Notification.Action.Builder copy constructor 
The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.

Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes: 31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java
 2016-10-12 15:19:55 -07:00
Michal Karpinski
6dbf67fc48 Don't expose default strong auth timeout as constant 
The admin can instead use the value of 0 to reset to default.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

Bug: 31430135
Change-Id: I0d6b29ca4eca65d7ca72a8975a0c28c9050a946c
(cherry picked from commit 943aabd11c)
 2016-10-12 09:34:12 +00:00
Alan Viverette
0754f59c4a Add note about density scaling behavior to setImageURI am: ac21e56f63 
am: 74c6d9bd3f

Change-Id: I5b6f9d978d61aedac2c53dcf75dea449468d3c7b
 2016-10-12 01:42:06 +00:00
Alan Viverette
74c6d9bd3f Add note about density scaling behavior to setImageURI 
am: ac21e56f63

Change-Id: I4a85ae20023dd0589227ca7684a965a246f451fd
 2016-10-12 01:36:33 +00:00
TreeHugger Robot
d35d3c98e4 Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev 2016-10-12 01:24:55 +00:00
Chet Haase
3267a2462d Fix small typo in ShortcutManager header docs am: c158431f8e 
am: 5aa0dfcc0a

Change-Id: Ia3a1a14cf561e6846245fa8265e96e954d8a185d
 2016-10-12 00:31:31 +00:00
Chet Haase
5aa0dfcc0a Fix small typo in ShortcutManager header docs 
am: c158431f8e

Change-Id: I303576d842f92358e9c97714e71c0407d53df39b
 2016-10-12 00:19:46 +00:00
Christopher Wiley
08395dce6a Add InterfaceConfiguration.isUp() 
Bug: 31337216
Test: None
Change-Id: Ifd83b069472fc50c9517fc69306e7938a9e9628c
 2016-10-11 16:47:44 -07:00
Alan Viverette
ac21e56f63 Add note about density scaling behavior to setImageURI 
Bug: 27327999
Change-Id: I1e348a1fbda20fff9575261df7097fbd46381383
 2016-10-11 23:32:10 +00:00
Chet Haase
c158431f8e Fix small typo in ShortcutManager header docs 
Bug: 32093275 fix typo in ShortcutManager javadocs
Test: no test, just words in the header docs
Change-Id: Icd33481a7f285686429d908cf92de0f6f886f962
 2016-10-11 21:48:55 +00:00
Nick Kralevich
34547a8dc2 Delete "Show CPU usage" am: fc4a5c2d85 
am: f0c0188a8a

Change-Id: If33e6687d3ec83904ab6ddbeb008c7b9c8130e7a
 2016-10-11 18:15:23 +00:00
Nick Kralevich
f0c0188a8a Delete "Show CPU usage" 
am: fc4a5c2d85

Change-Id: I4da784d136601fb3458b8697a0a27a232cd89111
 2016-10-11 18:09:10 +00:00
Nick Kralevich
ab7a44b41a Merge "Delete "Show CPU usage"" into nyc-mr1-dev 2016-10-11 18:03:29 +00:00
Nick Kralevich
fc4a5c2d85 Delete "Show CPU usage" 
This functionality hasn't worked since Lollipop.

Bug: 21388590
Change-Id: Ie4388d88f6e06f3e2d2e84e9c4515b3ebc6a0ea5
 2016-10-11 09:01:38 -07:00