120998 Commits

Author SHA1 Message Date
Baligh Uddin
de11c26060 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-03-27 21:43:39 +00:00
Adam Hampson
25b32c65e7 hdmi: cec: add permission name to dump permission denial message
The android.security.cts.ServicePermissionsTest--testDumpProtected test was
failing on this service because it is looking for the permission name in the
denial message.

Change-Id: I4b4d38cd27b782470d1f21e36104164d2c8962a3
Signed-off-by: Adam Hampson <ahampson@google.com>
2014-03-27 14:20:23 -07:00
Adam Lesinski
587e420ea9 am 004ceaaa: am 55a65509: Merge "Reduce warning verbosity in aapt"
* commit '004ceaaa4d3ddfc66ba3f3635e987c2ddc7f2d09':
  Reduce warning verbosity in aapt
2014-03-27 21:05:06 +00:00
Adam Lesinski
004ceaaa4d am 55a65509: Merge "Reduce warning verbosity in aapt"
* commit '55a655091a30667ba7c091dc22d350c0bb8d8641':
  Reduce warning verbosity in aapt
2014-03-27 21:00:08 +00:00
Adam Lesinski
55a655091a Merge "Reduce warning verbosity in aapt" 2014-03-27 20:55:14 +00:00
Craig Mautner
af89d7e21f am bffd4d43: Merge "Check return values for null." into klp-modular-dev
* commit 'bffd4d437d133164877c6a194d6a533299072fae':
  Check return values for null.
2014-03-27 20:25:45 +00:00
Craig Mautner
bffd4d437d Merge "Check return values for null." into klp-modular-dev 2014-03-27 20:22:20 +00:00
Craig Mautner
d3849f5415 Check return values for null.
When a Display has been removed there is a delay until all of its
windows have been removed. Therefore there is a possibility that
WindowState.getDisplayContent() returns null. Guard against that
possibility.

Fixes bug 13616765.

Change-Id: Ia2074d293b0e1bd4ca2cd14aeb4a2cc09ed9f41e
2014-03-27 13:19:29 -07:00
Scott Main
653aa40ef5 am 7b190e0f: am 22b483ee: am bbaf11f4: update viewport variable with new underscore format
* commit '7b190e0f1df16346696465c0114179b423afc26d':
  update viewport variable with new underscore format
2014-03-27 20:19:20 +00:00
Craig Mautner
723f7bbcf3 am 7f7ce0f7: am a2824410: Merge "Do not show Home behind full screen activity"
* commit '7f7ce0f71b5f1b5274b0cda190401823508cda1f':
  Do not show Home behind full screen activity
2014-03-27 20:14:13 +00:00
Scott Main
7b190e0f1d am 22b483ee: am bbaf11f4: update viewport variable with new underscore format
* commit '22b483ee6e029dc9db4ae390b91c449b7977273d':
  update viewport variable with new underscore format
2014-03-27 20:13:59 +00:00
Scott Main
22b483ee6e am bbaf11f4: update viewport variable with new underscore format
* commit 'bbaf11f42152d03c26ec0dc02061dc93a1feb830':
  update viewport variable with new underscore format
2014-03-27 20:08:17 +00:00
Craig Mautner
7f7ce0f71b am a2824410: Merge "Do not show Home behind full screen activity"
* commit 'a282441038b8a82be1b9b6afc41145e5570ce377':
  Do not show Home behind full screen activity
2014-03-27 20:07:57 +00:00
Scott Main
bbaf11f421 update viewport variable with new underscore format
Change-Id: I68d9e4a57273d86adb9fa2721dc2ce1dbe3ce937
2014-03-27 13:01:56 -07:00
Craig Mautner
a282441038 Merge "Do not show Home behind full screen activity" 2014-03-27 20:01:11 +00:00
Selim Cinek
7718fc1291 Fixed crash when setting wallpaper with built in rotation
If an image had a built in rotation, a crash could occur,
when setting it. An example was a panorama image which had
a rotation of 90 degrees

Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
Bug: 13507421
2014-03-27 19:34:01 +00:00
Scott Main
9a5c6e6812 am 4243710b: am 89f4a546: am 0c933df6: fix bug in code snippet
* commit '4243710bf8b4bf3a0bec9c4cf3b00e4b69651883':
  fix bug in code snippet
2014-03-27 19:17:05 +00:00
Scott Main
4243710bf8 am 89f4a546: am 0c933df6: fix bug in code snippet
* commit '89f4a5463b11f98b62aa9639a99d3f9ca81b92c4':
  fix bug in code snippet
2014-03-27 19:08:23 +00:00
Scott Main
89f4a5463b am 0c933df6: fix bug in code snippet
* commit '0c933df6d09dfb3923e0891028c67249bc8887d5':
  fix bug in code snippet
2014-03-27 19:02:33 +00:00
Scott Main
0c933df6d0 fix bug in code snippet
Change-Id: I98f582d23e5522ef29b9b366bf4a7175eac0bbd5
2014-03-27 11:53:38 -07:00
Colin Cross
c1a7d0758d am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit '232d422405d686eb493b48370a2b2f7c35fe96fb':
  app_process: use LOCAL_MULTILIB := both
2014-03-27 17:36:27 +00:00
Colin Cross
232d422405 am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit 'f0ffa8a38e90f64912686833dba9823b251fae57':
  app_process: use LOCAL_MULTILIB := both
2014-03-27 17:30:01 +00:00
Colin Cross
f0ffa8a38e Merge "app_process: use LOCAL_MULTILIB := both" 2014-03-27 17:26:08 +00:00
Colin Cross
f130f0aaea app_process: use LOCAL_MULTILIB := both
Use LOCAL_MULTILIB := both to build app_process64 instead of
duplicating the build rule.

Also causes PRODUCT_PACKAGES := app_process to install both
versions on 64-bit platforms, as the module names for both
app_process and app_process64 are now app_process.

Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
2014-03-27 10:20:29 -07:00
Adam Lesinski
6984e4f9bb am fc680b89: Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev
* commit 'fc680b89184fb60cf9a58e81d7f890002310702d':
  Fix a race in NotificationManager with Listeners
2014-03-27 17:18:03 +00:00
Adam Lesinski
fc680b8918 Merge "Fix a race in NotificationManager with Listeners" into klp-modular-dev 2014-03-27 17:11:35 +00:00
Olivier Gay
d2923266ae Add support for additional international keyboard mappings
Add kcm mapping files for Arabic, Greek, Hebrew, Lithuanian
and Spanish (Latin).

Change-Id: I35cb2a4d6e016c6f565fba05710ba1626452fe68
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
2014-03-27 17:49:52 +01:00
Narayan Kamath
22d074643e resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
2014-03-27 12:50:58 +00:00
Narayan Kamath
eaab4df0dd am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"
* commit 'cd3f60f30366a34b4499aab5a47b622069ba9cd6':
  AArch64: Make frameworks/base code more portable
2014-03-27 12:36:10 +00:00
Narayan Kamath
cd3f60f303 Merge "AArch64: Make frameworks/base code more portable" 2014-03-27 12:30:53 +00:00
Ashok Bhat
f5df700e6c AArch64: Make frameworks/base code more portable
Changes in this patch include

[x] Use %zu for size_t, %zd for ssize_t

[x] 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: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-03-27 12:30:42 +00:00
Scott Main
68d43e275e am b5e754dd: am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit 'b5e754dd4d8accd0c1500008aa1a6dbf178d33d7':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-27 09:31:08 +00:00
Scott Main
b5e754dd4d am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit '8ea583a71aef2f21f833c003a948ca7b1dc32915':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-27 09:24:46 +00:00
Scott Main
8ea583a71a am f9943d0e: Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs
* commit 'f9943d0ecf4d3360064a4cec0b1ffd6767db5612':
  add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-27 09:15:18 +00:00
Yevgen Pronenko
0fd4c656d0 Do not show Home behind full screen activity
When ensureActivitiesVisibleLocked goes through foreground activity
stack and reaches non-fullscreen activity, it sets showHomeBehindStack
variable to true.

If there is a fullscreen activity behind, showHomeBehindStack remains
unchanged, which causes Home application to be displayed anyway.
In this case user will see a fullscreen activity and Home activity
simultaneously.

To fix the issue we set showHomeBehindStack to false when we reach
fullscreen activity in the activity stack.

This was made visible by the following commit:
446ef1de8d373c1b017df8d19ebf9a47811fb402

Change-Id: I535c1283a4e26f5cf606375b837d4b7195324af0
2014-03-27 07:54:37 +01:00
Scott Main
f9943d0ecf Merge "add the JD docs for the Android Wear docs (delte the HTML versions) This depends on the following CL that makes this all work with template changes: I848f442b3bc66ee2fb87db8200df370d13762d29" into klp-docs 2014-03-27 06:24:15 +00:00
Scott Main
ef17956363 am e0c66e73: am 74b821dc: am 09131844: add viewport width override to each landing page and fix link on homepage
* commit 'e0c66e73b45f228a87086257a9aa7c13361f8b18':
  add viewport width override to each landing page and fix link on homepage
2014-03-27 03:32:41 +00:00
Scott Main
e0c66e73b4 am 74b821dc: am 09131844: add viewport width override to each landing page and fix link on homepage
* commit '74b821dce313307584b1abecc2fa8d4da826ff65':
  add viewport width override to each landing page and fix link on homepage
2014-03-27 03:26:45 +00:00
Scott Main
74b821dce3 am 09131844: add viewport width override to each landing page and fix link on homepage
* commit '0913184499e76996baf047ecbcbd2b79e2c92643':
  add viewport width override to each landing page and fix link on homepage
2014-03-27 03:20:34 +00:00
Scott Main
0913184499 add viewport width override to each landing page and fix link on homepage
Change-Id: I54cfd2e5a0f127d26644e126d41c5044729af9c5
2014-03-26 20:10:34 -07:00
Scott Main
039d44114e add the JD docs for the Android Wear docs (delte the HTML versions)
This depends on the following CL that makes this all work with template changes:
I848f442b3bc66ee2fb87db8200df370d13762d29

Change-Id: I6b17db774de6fa8be0bf944516a44ba73b10cabb
2014-03-26 19:23:38 -07:00
Adam Lesinski
e824026554 Fix a race in NotificationManager with Listeners
After being bound to, a NotificationListenerService could
make a call into NotificationManagerService before having been
added to the list of active services.

Bug: 13644375
Change-Id: I4ed920d165f46d009f91e28ca13c3926563cd110
2014-03-26 17:52:54 -07:00
Kenny Root
1dc1d6b22d am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '5b93685af37d840e7ef6d415bcfe8a8a4c004032':
  CertificateChainValidator: initialize TrustManagerFactory
2014-03-27 00:10:41 +00:00
Kenny Root
5b93685af3 am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory"
* commit '57f2764bf104b0fe7b5cd67ad5b2cae9bc8352ed':
  CertificateChainValidator: initialize TrustManagerFactory
2014-03-26 23:59:11 +00:00
Ricardo Cervera
cddd3b151f am bb7bb60a: am e94b79d7: am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs
* commit 'bb7bb60a713f7c11ed23203318c50e2c0103b08d':
  docs: Added info on using HTTPS for the Eclipse ADT update site
2014-03-26 23:12:22 +00:00
Ricardo Cervera
bb7bb60a71 am e94b79d7: am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs
* commit 'e94b79d7037336f939ae3bc64a17df245b254e17':
  docs: Added info on using HTTPS for the Eclipse ADT update site
2014-03-26 23:06:10 +00:00
Jinsuk Kim
40a00a341b Replace individual methods with a consolidated CEC nativeSendmessage
It saves us from having to add numerous native methods to HdmiCecService.
A new native method that reports physical address was added in consequence
to be able to build the message in Java side.

Other changes:
 - Substituted more concrete type (cec_device_type_t) to int.
 - Fixed the issue about byte endianness in handling physical
   address/vendor id. The bytes of variable mPhysicalAddress in native
   service were being reversed previously but still worked because they
   were reversed again when copied out to outgoing messages. Vendor id
   had a bug of bytes being reversed. In order to fix the issue, the way
   they are copied to byte array was changed so that it becomes
   independent to byte endianness.
 - CL's for header/HAL implementation changes are:
   https://googleplex-android-review.git.corp.google.com/#/c/437667
   https://googleplex-android-review.git.corp.google.com/#/c/437668

Change-Id: Id1ac683fe54597a2c707f30492c7f86e5392504d
2014-03-27 07:59:31 +09:00
Ricardo Cervera
e94b79d703 am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs
* commit 'c5b54aed1772de65d3f799e3fb6644ec1b791130':
  docs: Added info on using HTTPS for the Eclipse ADT update site
2014-03-26 22:59:15 +00:00
Ricardo Cervera
c5b54aed17 Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs 2014-03-26 22:54:02 +00:00
Kenny Root
57f2764bf1 Merge "CertificateChainValidator: initialize TrustManagerFactory" 2014-03-26 22:51:52 +00:00