Commit Graph

36352 Commits

Author SHA1 Message Date
Narayan Kamath
0d8c3c469e am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '5f83ff6ffa82fb84df6feab4339054b302ac391e':
  AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 13:06:52 +00:00
Narayan Kamath
5f83ff6ffa am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit 'e7d7908c28adf77de2cefba4f2a554b770d49def':
  AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 13:04:10 +00:00
Narayan Kamath
e7d7908c28 am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '02baba25545b232436502a73e2928a1d72fa240e':
  AArch64: Use long for pointers in DisplayEventReceiver
2014-01-07 05:01:03 -08:00
Ashok Bhat
27285821b7 AArch64: Use long for pointers in DisplayEventReceiver
For storing pointers, long is used as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-01-07 12:48:43 +00:00
Narayan Kamath
d2098682ab am 3f2843a4: am c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '3f2843a447f037492cf6d2fde928ef88a1d77bc8':
  XmlUtils#readThisMapXml should handle null keys.
2014-01-07 10:14:00 +00:00
Narayan Kamath
3f2843a447 am c47b7d37: am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit 'c47b7d377c4785f84a22c42c6a99716cceb5973c':
  XmlUtils#readThisMapXml should handle null keys.
2014-01-07 10:10:49 +00:00
Narayan Kamath
c47b7d377c am 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '9d4ebdcafaa6a3f29978a7095f2bc3cbe0d5240a':
  XmlUtils#readThisMapXml should handle null keys.
2014-01-07 02:08:02 -08:00
Narayan Kamath
cf1aa551ee Merge "XmlUtils#readThisMapXml should handle null keys." 2014-01-07 10:03:21 +00:00
Conley Owens
5b44325fff am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '849ab14d7237d3474f6dde3731ab65624ac297ac':
  CompoundButton: Let text can be changed by config
2014-01-06 23:48:58 +00:00
Conley Owens
849ab14d72 am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '7f16047b9efeba7cf82690b0492eaed44ca017df':
  CompoundButton: Let text can be changed by config
2014-01-06 23:46:00 +00:00
Conley Owens
7f16047b9e am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '73a6702eeaabdeb7b405ec504413d41716ef3508':
  CompoundButton: Let text can be changed by config
2014-01-06 15:41:50 -08:00
Conley Owens
4440a8244e Merge "CompoundButton: Let text can be changed by config" 2014-01-06 23:36:03 +00:00
Dave Platt
76e5ca81b3 Fix descriptor leak after accepting connections
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

Bug: 11805817

(cherry picked from commit 3e7305c6bf)

Change-Id: I723d7c5544ee4b6858894c215716cbc32a958df1
2014-01-06 14:31:28 -08:00
Dave Platt
02f042ddd9 Fix socket descriptor leak from Zygote to child app
Due to an API change in LocalSocket, Zygote must now
manually close the FileDescriptor it created when it
registered a LocalServerSocket.  The LocalSocket.close()
routine will no longer do so.

Bug: 12114500

(cherry picked from commit 70ef29b04e)

Change-Id: Ief23a3c99e007dc4aa6f94dfb47a1b2b6c854dad
2014-01-06 13:59:20 -08:00
Raph Levien
971003c9ff am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"
* commit 'ece5bc9d692ec1579f45d9e28fdf52c1d966a21b':
  Re-initialize error after attach
2014-01-06 17:12:18 +00:00
Todd Poynor
a807dbaeed am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
* commit '91ecb36df50be3446809e9da2a8f571d157f7549':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
2014-01-06 17:12:11 +00:00
Raph Levien
ece5bc9d69 am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"
* commit '7b6b85d260fb4fe739e0af0cc0328e0678872899':
  Re-initialize error after attach
2014-01-06 17:08:56 +00:00
Raph Levien
7b6b85d260 am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"
* commit 'd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd':
  Re-initialize error after attach
2014-01-06 09:06:06 -08:00
Raph Levien
a980c7aa3e Merge "Re-initialize error after attach" 2014-01-06 17:00:49 +00:00
Craig Mautner
e0a3884cb6 Extend stack management to other displays.
- Abandon ActivityContainer.startActivity() in favor of
IActivityManager.startActivityAsUserInContainer().
- Modify Am to test starting an activity on a container.
- Create a DisplayContext as the base context if the activity token
is on a different display.
- Test for home display in more cases when manipulating home stack.
- Rename mDisplayInfos => mActivityDisplays.
- Create new method for moving task to front of stack regardless of
which display it is on.

Change-Id: I4fcb83ae844c5839ee3e2722229623d1a80ed921
2014-01-06 08:51:21 -08:00
John Spurlock
3390018c6b Docfixes: three typos and escape */*.
Change-Id: I418d855b5d08a1a20eaca3d8e4d2e5d0fca23dd5
2014-01-06 11:44:42 -05:00
Narayan Kamath
f748257eee XmlUtils#readThisMapXml should handle null keys.
Both readThisValueXml & writeThisValueXml have been
implemented to handle values with "null" names.

Change readThisMapXml to allow such names as well, and
map them to the null key in the resulting HashMap.
readThisListXml and readThisSetXml already support
null names.

bug: https://code.google.com/p/android/issues/detail?id=63463

Change-Id: I1c93976656e45e7733113eb67d29b6bad5d25f1f
2014-01-06 11:18:21 +00:00
Todd Poynor
91ecb36df5 ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
2014-01-03 16:30:25 -08:00
Mark Doliner
9525f2a72e Miscellaneous small documentation fixes.
Most of these I noticed on my own. The change to docs/html/tools/testing/testing_ui.jd is mentioned in a bug report:
https://code.google.com/p/android/issues/detail?id=56324

Signed-off-by: Mark Doliner <markdoliner@google.com>
2014-01-03 19:15:36 +00:00
Mark Doliner
879ea451ce Fix documentation for Parcel.readException().
The old documentation was kind of useless and not clear, so this is an
improvement.

In addition to this change, I think this method should probably be private
instead of public, especially since the values for code are private. But it's
too late to change that now. Also the method name is pretty poor, since it's
not actually reading anything. Something like "throwException" would be more
appropriate.

I'm open to suggestions on how to improve this situation. Maybe mark the
method as deprecated with a comment that it will be made private in the
future?

Change-Id: I830f2bcf606714bd130d8c953aa33974b33c9a83
2014-01-02 12:38:07 -08:00
quddusc
6208ef25fd am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs
* commit 'c609cb0d62b25b2526b8401e576df4dce5aa5a92':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
2013-12-26 23:49:51 +00:00
quddusc
b889885e9b am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs
* commit '34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
2013-12-26 15:33:47 -08:00
quddusc
34dbf7c323 am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs
* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
2013-12-20 23:10:28 +00:00
quddusc
9072110b82 docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
2013-12-20 14:55:09 -08:00
Adam Lesinski
b102b2cc73 Move SystemService code to frameworks/base/core
Paves the way for building services without needing to see the
rest of frameworks/base/services.

Change-Id: I8ac4bc9d25471e96076cd888c1fc24b918d8911f
2013-12-20 13:27:38 -08:00
Amith Yamasani
9158825f9c Move some system services to separate directories
Refactored the directory structure so that services can be optionally
excluded. This is step 1. Will be followed by another change that makes
it possible to remove services from the build.

Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
2013-12-19 15:25:37 -08:00
Peter Eliasson
55eda43af9 Cursor leakage due to cancellation signal
If a query call was cancelled, the cursor adaptor might leak. The
adaptor is now closed if any exception is thrown during query.

Change-Id: Ic4c2edeaf2fcef56b4ef59484a36d3233aa12dbc
2013-12-19 09:08:05 +01:00
Dave Allison
24bafbc933 Add a call to registerAppInfo for the VMRuntime
This calls into the VMRuntime tells it where the
application directory is located.

Bug: 11539952
Change-Id: I20e0b8c63e459699a1bc9af435e65ae96f1e1e73
2013-12-18 17:01:37 -08:00
Craig Mautner
4a1cb22056 Pair ActivityStacks with Displays
- Introduce concept of ActivityStacks residing on Displays and able
to be decoupled and moved around.
- Add a new interface, IActivityContainer for clients to handle
ActivityStacks.
- Abandon ordering of stacks based on mStackState and instead use
ActivityDisplayInfo.stacks<ActivityStack> ordering.

Progress towards closing bug 12078972.

Change-Id: I7785b61c26dc17f432a4803eebee07c7415fcc1f
2013-12-18 15:08:15 -08:00
Scott Main
991ba3b7f2 am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
* commit '74e9e698260c16c41dab38de302db6e3e807ddd5':
  fix typos bug: 11693951 bug: 12118617
2013-12-18 00:50:59 +00:00
Scott Main
7d1f8e6570 am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
* commit 'efe102332861bd05f0cba60e729661607546de34':
  fix typos bug: 11693951 bug: 12118617
2013-12-17 16:44:31 -08:00
Scott Main
efe1023328 am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617
2013-12-18 00:41:23 +00:00
Scott Main
688342f98c fix typos
bug: 11693951
bug: 12118617

Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
2013-12-17 13:55:02 -08:00
Narayan Kamath
1dfe799027 am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '8f90e47694b441941fdf5f17fcb9927ec23fb50b':
  Use StrictJarFile instead of JarFile for cert collection.
2013-12-16 15:26:41 +00:00
Narayan Kamath
28635ca3e3 am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '44291d9c2722e0d22dc6f909585f4302abdce205':
  Use StrictJarFile instead of JarFile for cert collection.
2013-12-16 07:20:26 -08:00
Narayan Kamath
44291d9c27 Merge "Use StrictJarFile instead of JarFile for cert collection." 2013-12-16 11:29:46 +00:00
Daniel 2 Olofsson
f4ecc55657 Re-initialize error after attach
If flag for error after attach is not reinitialized, it may cause
NullPointerException on subsequent onAttachedWindow if error text
was reset to null.

Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38
2013-12-16 11:05:42 +01:00
Kenny Root
e0b14ea70b am 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '31b9ec01ff6087773cb35af6824a6422a0181afb':
  Use java.util.Objects instead on internal API
2013-12-13 22:23:33 +00:00
Kenny Root
62d509d24f am 37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '37c69fdd826f3973966430adc1abfbefc19bc16e':
  Use java.util.Objects instead on internal API
2013-12-13 14:17:29 -08:00
Kenny Root
e6585b32ea Use java.util.Objects instead on internal API
Not needed since java.util.Objects implements all the needed
functionality.

Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
2013-12-13 13:40:30 -08:00
Narayan Kamath
1f0299a9cb Use StrictJarFile instead of JarFile for cert collection.
This ensures that we use the same underlying zip
processing code as the runtimes.

bug: 10193060

(cherry picked from commit eb565dc527)

Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c
2013-12-13 16:21:58 +00:00
Katie McCormick
9c514b8fe9 am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
* commit '4561f1990def36aef17dbb35511a1522195e7f95':
  Doc update: Update package summary for BT.
2013-12-13 01:04:09 +00:00
Katie McCormick
08e0142fb7 am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
* commit 'f85470e6861e012c145dc04d70656757be611280':
  Doc update: Update package summary for BT.
2013-12-12 16:58:35 -08:00
Katie McCormick
f85470e686 am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
* commit 'fbbc1b791e0a26a56bc8d45622d06f06e020191a':
  Doc update: Update package summary for BT.
2013-12-13 00:55:59 +00:00
Katie McCormick
f2041ac56e Doc update: Update package summary for BT.
Fixes:

b/8584860

Change-Id: Ic85436f90b46508e6a182e3fc51365f5bfb8da14
2013-12-12 15:42:00 -08:00