Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,299 Commits 3 Branches 0 Tags
3458e180cf1dab2be19d00758b64033061aa62d2
Commit Graph

47410 Commits

Author SHA1 Message Date
Kenny Guy
3458e180cf Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca 
automerge: 11c4cc1

* commit '11c4cc196de9dca3bfad711b1b9e4b779a72cc01':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:24:01 +00:00
Kenny Guy
11c4cc196d Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 
automerge: 06ab0ca

* commit '06ab0ca4812450ec297722957e18b34cbfa733b2':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:17:03 +00:00
Kenny Guy
06ab0ca481 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev 2015-01-21 16:13:24 +00:00
Narayan Kamath
ebc57c7471 Merge "Choose the right executable for wrapped applications." automerge: aa87e89 
automerge: 4af0265

* commit '4af0265a35bcd8a0a7513dd85fe371597e2038c5':
  Choose the right executable for wrapped applications.
 2015-01-21 14:09:33 +00:00
Narayan Kamath
aa87e89e81 Merge "Choose the right executable for wrapped applications." 2015-01-21 14:01:57 +00:00
Jinsuk Kim
00959a56e5 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 
automerge: 375ae7b

* commit '375ae7ba3263ee8eceeb371b170e9181c801c612':
  Mark TimeUnit as @SystemApi
 2015-01-20 23:47:44 +00:00
Jinsuk Kim
375ae7ba32 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 
* commit '054f2656a17a438aa6e8c8f6dcd61b1217f41b88':
  Mark TimeUnit as @SystemApi
 2015-01-20 22:43:34 +00:00
Jinsuk Kim
054f2656a1 Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 2015-01-20 22:39:53 +00:00
Jinsuk Kim
28d2a693ef Mark TimeUnit as @SystemApi 
Bug: 18960664
Change-Id: If2c1259b312138bad9416b10f14a8af0f1a222f4
 2015-01-21 07:33:40 +09:00
Kenny Guy
2b43c73e66 Only hide cross profile disclosure when showing resolver. 
Hiding the cross profile discoloure for all system apps
also meant it wasn't shown for CALL_PRIVILEGED intents.

Bug: 18702461
Change-Id: I8129bc4b07573b547aefe2dbcc6938a60305c216
 2015-01-20 19:27:38 +00:00
Neil Fuller
77e7f40116 am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." 
* commit 'aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e':
  Fix for broken docs build.
 2015-01-20 15:29:55 +00:00
Neil Fuller
42c2ac00e6 Merge "Fix for broken docs build." 2015-01-20 15:18:59 +00:00
Neil Fuller
ae69120b0f Fix for broken docs build. 
Broken by commit 50a01d8960

Change-Id: Iab460aa6254d320349f67e747f763bbf06d3e9e7
 2015-01-20 15:17:04 +00:00
Neil Fuller
7014da74e8 resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp 
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
 2015-01-20 13:21:58 +00:00
Neil Fuller
00502e8960 Merge "Changes associated with an OkHttp upgrade" 2015-01-20 12:50:48 +00:00
Neil Fuller
50a01d8960 Changes associated with an OkHttp upgrade 
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
 2015-01-20 11:59:24 +00:00
Narayan Kamath
37ad4b0242 Choose the right executable for wrapped applications. 
64 bit zygotes should exec app_process64, whereas 32 bit
zygotes should exec app_process32.

Change-Id: I63b56400e0478cd2bb206c98da6858be558f0525
 2015-01-19 16:09:17 +00:00
Narayan Kamath
66bbfb6b2c am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." 
* commit '17f50f8119f4a8bdec304cde527f68ddd0b3bc0a':
  Remove support for --classpath and make --runtime-init the default.
 2015-01-19 15:21:30 +00:00
Narayan Kamath
1f7d657b43 am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]." 
* commit '3e809794fe558d8a10851c0ac22a65a2c81fa315':
  Fix handling of wrapped processes [part 1].
 2015-01-19 15:16:58 +00:00
Narayan Kamath
f48029f00a Remove support for --classpath and make --runtime-init the default. 
--classpath hasn't been properly supported or used for as long as
git history exists, and the non --runtime-init classpath is useless
without it.

Also, forking and exec' a bare dalvikvm instance from the zygote seems
somewhat pointless since we might as well just execute it directly.

Change-Id: Ib07d822d448e7b431d7564381f9cd11735fd1113
 2015-01-19 15:04:58 +00:00
Narayan Kamath
6ac7e67168 Fix handling of wrapped processes [part 1]. 
Change 3fe595108f changed our pipe creation to CLOEXEC,
which doesn't work so well for wrapper processes that call exec.

Sending down the PID pre-exec won't work so well because wrappers
are arbitrary and might fork themselves before finally starting
the child application process.

Change-Id: I065f0f2150dc1ff04d2b2e8b25f06b4c754809b9
 2015-01-19 14:17:49 +00:00
Narayan Kamath
e05f269bfe am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]" 
* commit '96b87a1dc0b822a057ad978de1d52990d617be62':
  Fix handling of wrapped processes [part 2]
 2015-01-19 10:15:32 +00:00
Svet Ganov
605ba80277 am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 
* commit '2004fdf8e54daa84a8c4da20909f81f37add66d5':
  Fixing a memory leak: activities are leaked.
 2015-01-16 22:25:01 +00:00
Svet Ganov
2004fdf8e5 am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 
* commit '830f39ad3cb2c0ff2300c7288e695def37e3b1dd':
  Fixing a memory leak: activities are leaked.
 2015-01-16 22:18:57 +00:00
Svet Ganov
830f39ad3c Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 2015-01-16 22:12:56 +00:00
Craig Mautner
62e815bf7b am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit '02c7c97a62ba9b79e56d1f7e206615e6eaca0689':
  More debugging for bug 18201239.
 2015-01-16 21:07:13 +00:00
Craig Mautner
02c7c97a62 am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit 'ac70b2d1722fd3ad94b2bf1e8c7695bded56987a':
  More debugging for bug 18201239.
 2015-01-16 21:01:25 +00:00
Craig Mautner
ac70b2d172 Merge "More debugging for bug 18201239." into lmp-mr1-dev 2015-01-16 20:56:58 +00:00
Craig Mautner
66c4a824b9 More debugging for bug 18201239. 
Fixes bug 19045133.

Change-Id: I2ef2b8600278ed91df59db4acf4740dac970ee3a
 2015-01-16 12:52:54 -08:00
Ricardo Cervera
1e59b338e6 am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '083146428420dd3daa887d6e9c019e747a604cb5':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:47:08 +00:00
Ricardo Cervera
0831464284 am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '90312d808f4a5181b5cb99c78e64b7e5d1465895':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:41:59 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:36:45 +00:00
Ricardo Cervera
2287879039 am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:29:25 +00:00
Svet Ganov
893d6fe48d Fixing a memory leak: activities are leaked. 
TextLine was not fully cleared before recycling it which leads to
activity leaks if the activity happens: to register a text watcher.

bug:19045507

Change-Id: Ife0f7ce29865bd30ca2dfe8795023f51f275d659
 2015-01-16 18:14:36 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Narayan Kamath
23e68780be Fix handling of wrapped processes [part 2] 
Drop privileges only if we're root. Zygote.preloadClasses can
be called from a non-root uid / gid in the case of wrapped classes,
so we shouldn't die from the resulting EPERM.

Change-Id: Ie3fbe50a17ec49bcbcb875c3a2ee1e1a3a62e88d
 2015-01-16 17:40:35 +00:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:14:44 +00:00
Narayan Kamath
2488c0ad50 am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '27d3e79031081ab131d5bc4680b80e46a466db53':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:16:59 +00:00
Narayan Kamath
e5515772af Fix a property name that's longer than 31 chars. 
The name wasn't chosen without much thought and is intended
to be a temporary fix to keep devices booting while a better
name is decided upon.

bug: 18335678
Change-Id: Ic3451255d870f3395cfbcaa08a7764d93defc350
 2015-01-16 14:04:56 +00:00
Jeff Sharkey
c2ae6fb9ad Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge 
Change-Id: Id6db8cce3a477572478a1d50f624823200848896
 2015-01-15 21:27:13 -08:00
Jeff Sharkey
f24e490058 Merge "Offer to detect non-SSL/TLS network traffic." 2015-01-16 01:11:27 +00:00
Jeff Sharkey
605eb79c95 Offer to detect non-SSL/TLS network traffic. 
Introduces new module that provides network-related features for
the StrictMode developer API.  The first feature offers to detect
sockets sending data not wrapped inside a layer of SSL/TLS
encryption.

When a developer enables, we ask netd to watch all outgoing traffic
from our UID, and penalize us accordingly if cleartext sockets are
detected.  When enabled, netd captures the offending packet and
passes it back to the owning process to aid investigations.  When
death penalty is requested, all future traffic on the socket is
blocked, which usually results in a useful stacktrace before the
app is actually killed.

Bug: 18335678
Change-Id: I3adbc974efd8d3766b4b1a23257563bb82d53c29
 2015-01-15 15:59:03 -08:00
Craig Mautner
b523c55d76 am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '41d54237380d5f3c06ab2a71715e22f048278ecf':
  Debug for bug 18201239.
 2015-01-15 23:30:41 +00:00
Craig Mautner
41d5423738 am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '92cf3608b8f171f84f74ab1f7193a6a816063d14':
  Debug for bug 18201239.
 2015-01-15 23:24:40 +00:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Alan Viverette
78dfb182d2 am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit 'dbe54533499571f34ddc126ea21379932ea1d6d7':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:37:40 +00:00
Alan Viverette
dbe5453349 am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:32:27 +00:00
Alan Viverette
77e1f7a27b Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 2015-01-15 22:25:08 +00:00