Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,539 Commits 3 Branches 0 Tags
397ca8be8de407237cd293873647c182837bc032
Commit Graph

45147 Commits

Author SHA1 Message Date
Johnson Hsieh
24c33d32cc Merge "Expose CommandRequest completion status." 2015-01-21 01:39:19 +00:00
Johnson Hsieh
dd32946def Expose CommandRequest completion status. 
Expose CommandRequest completion status in client api onCommandResult().

Change-Id: Ib2066b7ca6d7b1ae968da7e7686e34107dc7dfa8
 2015-01-20 17:11:50 -08:00
Jinsuk Kim
0ae35a8a26 am 00959a56: am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev automerge: 375ae7b 
* commit '00959a56e5869fcb8d05399656fddc9da54e86dc':
  Mark TimeUnit as @SystemApi
 2015-01-20 23:54:47 +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
Chris Banes
025ac537fd Merge "Fix NPE in ActionMenuView when there isn't a presenter" 2015-01-20 22:08:33 +00:00
Todd Kennedy
e50c298cc2 Merge "Don't read float from parcel" 2015-01-20 19:26:45 +00:00
Todd Kennedy
e635f66842 Don't read float from parcel 
We were reading a float from a parcel, but, never writing the float. Also
opportunistically fix a couple warnings where we were using raw classes
instead of their templatized version.

Bug: 19001243
Change-Id: I6e2a72795cf12bfaf880f2f46c1d91b207aa327c
 2015-01-20 11:12:52 -08:00
Todd Kennedy
4900bf9d82 Expose new binder call createStackOnDisplay() 
Creates a new, empty ActivityStack on a display. Use the binder call to
launch an activity on said stack.

Bug: 19001243
Change-Id: I0f04e8f2703bcc706f58e75333869fb35f6b1ee9
 2015-01-20 10:51:49 -08:00
Neil Fuller
df8e59abe5 am 77e7f401: am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." 
* commit '77e7f401161e778e7f06401ac72b132f5272d4e2':
  Fix for broken docs build.
 2015-01-20 15:35:50 +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
4c7ddabefa am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp 
* commit '7014da74e861f8cfc34fcbd528b4c83a1dc97503':
  Changes associated with an OkHttp upgrade
 2015-01-20 13:29:31 +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
d6fe549b50 am 66bbfb6b: am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." 
* commit '66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82':
  Remove support for --classpath and make --runtime-init the default.
 2015-01-19 15:24:02 +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
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
Chris Banes
5cd13265af Fix NPE in ActionMenuView when there isn't a presenter 
BUG: 19060917
Change-Id: I5d63aa6e85238ea7cec6faf60d444c98bc583293
 2015-01-19 12:08:22 +00:00
Alan Viverette
2ef9d1af45 Merge "Ensure spinner variables are initialized correctly" 2015-01-16 23:31:53 +00:00
Alan Viverette
3f221cf325 Ensure spinner variables are initialized correctly 
Removes the popup context setter, since this property cannot change
after inflation without losing data from the AttributeSet.

Bug: 19046761
Change-Id: I622f50d1752446a5b5793706c388e67a46ad06da
 2015-01-16 14:40:04 -08:00
Svet Ganov
22a08757b2 am 605ba802: am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 
* commit '605ba802778ed67ddd2ca1af7f55df6f2d257765':
  Fixing a memory leak: activities are leaked.
 2015-01-16 22:31:38 +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
62ccbb306b am 62e815bf: am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit '62e815bf7b154fe984e1a2aa8d615a2f04f71785':
  More debugging for bug 18201239.
 2015-01-16 21:12:53 +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
23a6d889aa am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 20:06:53 +00: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
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
d28f0fee61 am 2488c0ad: am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '2488c0ad505846f7655a7434006edea4515b02d0':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:23: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
0ec9c29fb7 am c2ae6fb9: Merge commit \'605eb79c9519307147fc1795d0eb155638a7f542\' into manualmerge 
* commit 'c2ae6fb9ada52e9c990542a6d1cae80085318f31':
  Offer to detect non-SSL/TLS network traffic.
 2015-01-16 06:09:05 +00:00
Jeff Sharkey
c2ae6fb9ad Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge 
Change-Id: Id6db8cce3a477572478a1d50f624823200848896
 2015-01-15 21:27:13 -08:00
Craig Mautner
8667eff6b8 Merge "Remove unused method moveTaskToBack." 2015-01-16 01:54:59 +00:00
Craig Mautner
428ecf2966 Remove unused method moveTaskToBack. 
Everyone uses moveActivityTaskToBack() instead.

Fixes item #3 of bug 18088522.

Change-Id: I16028335fe1eef8a2aa47804f46536e395a16d8c
 2015-01-15 17:20:40 -08:00