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

49056 Commits

Author SHA1 Message Date
Dianne Hackborn
4b94649ce3 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 automerge: 5346a21 
automerge: f6b4b1a

* commit 'f6b4b1a43253d5ea94763cf9750224c7b7b618c0':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 19:00:55 +00:00
Dianne Hackborn
f6b4b1a432 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 
automerge: 5346a21

* commit '5346a21bad95796611760d40c1540d1659038216':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:55:12 +00:00
Dianne Hackborn
5346a21bad Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 
automerge: 2132695

* commit '213269599bdec3d83d3d811f5e8f62b9fd8d245c':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:47:11 +00:00
Svetoslav
220dbc4a7f AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd automerge: 03944ce 
automerge: 2b2b1a9

* commit '2b2b1a9b890f40fd24bce27580d3124c2c98f373':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:43:41 +00:00
Dianne Hackborn
213269599b Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 2015-01-21 18:41:38 +00:00
Svetoslav
2b2b1a9b89 AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd 
automerge: 03944ce

* commit '03944ce664c733d1922247229fc56f6630c0a5e4':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:39:34 +00:00
Svetoslav
03944ce664 AlertActivity now behaves as a dialog for accessibility purposes. 
automerge: 76ff4dd

* commit '76ff4dd0de8d9747b9341f064dd270c5762705c6':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:31:46 +00:00
Svetoslav
76ff4dd0de AlertActivity now behaves as a dialog for accessibility purposes. 
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
 2015-01-21 18:28:03 +00:00
Dianne Hackborn
455625e298 Work on issue #18201239: ANRs in com.google.process.gapps: 
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
 2015-01-21 09:55:13 -08:00
Kenny Guy
2e0072d730 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca automerge: 11c4cc1 
automerge: 3458e18

* commit '3458e180cf1dab2be19d00758b64033061aa62d2':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:30:22 +00:00
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
e383132ac5 Merge "Choose the right executable for wrapped applications." automerge: aa87e89 automerge: 4af0265 
automerge: ebc57c7

* commit 'ebc57c7471f1ebe56cae091707887be582b0db06':
  Choose the right executable for wrapped applications.
 2015-01-21 14:13:27 +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
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
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
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
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
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
da1da678db am 1f7d657b: am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]." 
* commit '1f7d657b43fd7d40c402340c02ece5beb4b28c52':
  Fix handling of wrapped processes [part 1].
 2015-01-19 15:23:57 +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
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
Narayan Kamath
2e139d5b4c am e05f269b: am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]" 
* commit 'e05f269bfe17065f5a3d291961700e2d9befc345':
  Fix handling of wrapped processes [part 2]
 2015-01-19 10:20:54 +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
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