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

68102 Commits

Author SHA1 Message Date
Bryce Lee
ccd3468567 resolve merge conflicts of b1301fa to nyc-mr1-dev-plus-aosp 
Change-Id: Idb97adf36d981a340cdb5d24d4c3c3858d23e2fe
 2016-10-18 10:07:00 -07:00
Sanket Agarwal
933c625a92 Merge "Remove APIs that are not directly usable." am: 9cff57312d 
am: 086be31642

Change-Id: I5f95fe50d16b26601405816625f4aa45f2ef6647
 2016-10-17 21:32:21 +00: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
39c3166710 Merge "Add InterfaceConfiguration.isUp()" am: c7ea99a63c 
am: 281d7490bf

Change-Id: I79b84bd9cdde064be19c1110b3c3c08900123bdd
 2016-10-17 16:45:35 +00:00
Christopher Wiley
281d7490bf Merge "Add InterfaceConfiguration.isUp()" 
am: c7ea99a63c

Change-Id: Id0bc63c82f8ffd6ad411769ab012efd8bbdfa3ce
 2016-10-17 16:41:52 +00:00
Yohei Yukawa
36e5feffb7 Handle exceptions from #requestPermission() am: 93278ca144 
am: f8621ff5bf

Change-Id: I682e19b9f0657f840536b558204faf37872a7b36
 2016-10-15 00:44:43 +00:00
Yohei Yukawa
f8621ff5bf Handle exceptions from #requestPermission() 
am: 93278ca144

Change-Id: I5e8a3a9a670b1e794ce3af670fb30ffc4b8302a5
 2016-10-15 00:37:24 +00:00
Adam Lesinski
d7ec1ea697 Update DisplayMetrics even on default display am: 4309721843 
am: dab7950d80

Change-Id: I8bb2c9c303380abd3e1a54af68b8a8f7da3225f7
 2016-10-14 22:41:35 +00:00
Adam Lesinski
dab7950d80 Update DisplayMetrics even on default display 
am: 4309721843

Change-Id: Ib79935f0b80df42db789d94e0a88ac7a0b0b40d5
 2016-10-14 22:34:06 +00:00
Yohei Yukawa
93278ca144 Handle exceptions from #requestPermission() 
This is a follow up CL to my previous CL [1] that let
IInputConnectionWrapper to call InputContentInfo#requestPermission()
automatically so that temporary URI permissions can be granted
automatically on API 25+ devices whenever
INPUT_CONTENT_GRANT_READ_URI_PERMISSION is specified.

However, in that CL we forgot to handle exceptions thrown from
InputContentInfo#requestPermission().  This is problematic because it is
actually easy for IMEs to cause SecurityException by specifying a
content URI that does not allow grantUriPermission, e.g.:

  inputConnection.commitContent(
          new InputContentInfo(Uri.parse("content://call_log/test"),
          new ClipDescription("test", new String[]{"image/gif"}));

As a result, IMEs can let the application crash at any time because
InputContentInfo#requestPermission() is automatically called inside the
Framework.

This CL makes sure that exceptions thrown from
InputContentInfo#requestPermission() can be handled gracefully.

 [1]: Id955435dd2e72549ee7134f46b3c6951581694ad
      f3806f57a5

Bug: 32162481
Change-Id: I08916a1f54518390d3b67ab1673dc901e3f9716a
 2016-10-14 22:26:35 +00:00
Adam Lesinski
4309721843 Update DisplayMetrics even on default display 
Fix a bug where the DisplayMetrics wouldn't be updated for a Resources
object on the default display. Since multi-window, we want to update
all Resources.

This didn't always manifest itself due to recreation of assets, which
would force an update of DisplayMetrics. Re-use of an AssetManager from
the cache would expose the bug.

Bug:32133693
Bug:31998629
Test: cts-tradefed run cts --module CtsServicesHostTestCases
Change-Id: Ic51ab82710517b87eb995ccf982085dba876ad58
 2016-10-14 18:16:18 +00:00
Christopher Wiley
5f9fedc5d7 Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc am: eedd2b529d 
am: 53d12379f4

Change-Id: I4bcde8dde8c3bad7754e26dd56f8321032daa5a3
 2016-10-14 14:21:39 +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
TreeHugger Robot
a6b3caf58e Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev 2016-10-13 22:47:30 +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
TreeHugger Robot
b3ca7c26e1 Merge "Only full-data back up regular files + directories" into nyc-mr1-dev 2016-10-13 21:07:00 +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
Robert Sesek
f43d5b36d6 Merge "resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp 2016-10-13 18:55:37 +00:00
Christopher Wiley
53d12379f4 Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc 
am: eedd2b529d

Change-Id: Ica176cd4b1bf569dfa03bdcefac622deddb57eca
 2016-10-13 14:22:08 +00: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
Robert Sesek
d414158f79 resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp 
Change-Id: I71fbde71dd97abab77f798b621972fb1d26af799
 2016-10-12 15:03:19 -04: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
Jeff Sharkey
6f5f03b8c1 Set MIME type when building BROWSE intents. am: 42a4aaab44 
am: ac184d3c46

Change-Id: I3fb6cc86357c6e19efe58a6e4d31d1f79758b332
 2016-10-10 23:34:28 +00:00
Jeff Sharkey
ac184d3c46 Set MIME type when building BROWSE intents. 
am: 42a4aaab44

Change-Id: I9efdf0e7223b162988f9484b06c7e3665202738f
 2016-10-10 23:29:28 +00:00