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

68090 Commits

Author SHA1 Message Date
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
281d7490bf Merge "Add InterfaceConfiguration.isUp()" 
am: c7ea99a63c

Change-Id: Id0bc63c82f8ffd6ad411769ab012efd8bbdfa3ce
 2016-10-17 16:41:52 +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
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
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
Christopher Wiley
eedd2b529d Merge "IndexOutOfBoundsException observed in ProcessStats" 
am: 6408e2e5cc

Change-Id: I54ad3ac5a5e37371d787f4fee09fd8d73787665d
 2016-10-10 22:41:23 +00:00
Robert Sesek
0b58f198df resolve merge conflicts of 8f8d187 to nyc-dev-plus-aosp 
Change-Id: I75c7110ee4f0c9717e7276b609caa2402ef5c2be
 2016-10-10 18:34:42 -04:00
Christopher Wiley
6408e2e5cc Merge "IndexOutOfBoundsException observed in ProcessStats" 2016-10-10 22:31:33 +00:00
Jeff Sharkey
42a4aaab44 Set MIME type when building BROWSE intents. 
If we created a BROWSE PendingIntent early during boot (while the
device was still locked), we would resolve the MIME type as "null"
meaning the intent would fail to launch.

Since we always know what the MIME type will be, set it explicitly.

Test: boot device while USB device attached
Bug: 30742481
Change-Id: I23c523cbe2660ca63a3b7df1f41300ab803b314c
 2016-10-10 21:28:40 +00:00
Tobias Sargeant
7031dacaf5 Refactor ZygoteInit to support a WebView-specific zygote. 
am: dd4bb31639

Change-Id: Ie61bf8517c5b7a20beb67259d84e351f4a47665b
 2016-10-10 21:12:49 +00:00
Selim Cinek
e0c3c660a7 DO NOT MERGE - Added Emergency affordance feature 
Added a service that listens whether emergency affordances
are necessary.

If the they are needed, it adds an option to the
global actions dialog that directly launches the
emergency call and also adds a long-press listener
to the keyguard emergency button.

Test: adb shell settings put global force_emergency_affordance 1 && adb shell settings put global emergency_affordance_number 111112
Bug: 30404490
Change-Id: Ib96a15da2ef4b568a8d77140ebca6aa6f20f5ddb
 2016-10-10 18:58:23 +00:00
pengzhicai
5c6740a30c IndexOutOfBoundsException observed in ProcessStats 
When the process dead, IndexOutOfBoundsException observed in ProcessStats
https://code.google.com/p/android/issues/detail?id=223791&thanks=223791&ts=1474967996

Change-Id: Idbe4adf060c6898e838b5eaeecf476ba6c3e586d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
 2016-10-09 12:37:30 +00:00
Robert Sesek
8f8d187a78 Split the zygote logic out of android.os.Process into a new ZygoteProcess class. 
There is no functional change. This is to support adding new types of zygotes
that all operate using the same protocol.

Bug: 21643067
(cherry picked from commit 94e824bc1b)
(cherry picked from commit 96b49848e7)

Change-Id: I2e12057e4c2e7567f909d699b487e70b1664cca8
 2016-10-07 14:25:36 -07:00
Tobias Sargeant
dd4bb31639 Refactor ZygoteInit to support a WebView-specific zygote. 
This is a non-functional change that separates out functionality
that should be shared between the system zygote and the WebView
zygote from that which is system zygote specific.

* Move MethodAndArgsCaller to Zygote.
* Split out server socket functions into ZygoteServer.
* Add a new (stub, for now) WebViewZygoteInit class.

Bug: 22084679
Bug: 21643067
(cherry picked from commit ba816e0c9e)
(cherry picked from commit b9679dc1fa)

Change-Id: Iefdb0784dd08ac09a23aafe18663c13dce421775
 2016-10-07 14:25:20 -07:00
Alex Hills
21863add46 Updates documentation for MessagingStyle constructor am: fd590441c1 
am: d86df31497

Change-Id: I6bdc90b7fde47569823b49c556f3bca9b50b0e48
 2016-10-07 20:50:26 +00:00
Alan Viverette
36d83ffc5b Scale bitmap shaders for target density am: 0d2a46b733 
am: 444f2043d1

Change-Id: Ia0f4da2963e3a4a775cd2bb1324bd69ff86244b6
 2016-10-07 20:46:37 +00:00