drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,430 Commits 1 Branch 0 Tags
Commit Graph

88430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
8aa3db48a4 am 6ed48015: Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev 
* commit '6ed48015190d67d4a5f916d6c7f5365e3c10d0bf':
  docs: Update Nexus 10 device frames for darker, more accurate bezel rendering.
 2012-11-14 11:36:11 -08:00
Roman Nurik
6ed4801519 Merge "docs: Update Nexus 10 device frames for darker, more accurate bezel rendering." into jb-mr1-dev 2012-11-14 11:34:03 -08:00
Roman Nurik
2a45c152bd docs: Update Nexus 10 device frames for darker, more accurate bezel rendering. 
Change-Id: Id0a17f187c4ca3c24295257b0c5ca653d1c8cd4d
 2012-11-14 10:49:08 -08:00
Baligh Uddin
e3ade134fe Import translations. DO NOT MERGE 
Change-Id: I940584ca0ba981c5af42430d3166798595ff656b
Auto-generated-cl: translation import
 2012-11-14 10:40:07 -08:00
Baligh Uddin
dd0ffba856 Import translations. DO NOT MERGE 
Change-Id: I28291cc43ab74267b771dacf7dc570447a4a3dcf
Auto-generated-cl: translation import
 2012-11-14 10:39:26 -08:00
Baligh Uddin
0a26a6ca82 Import translations. DO NOT MERGE 
Change-Id: I13afa2f030ae612ee052a52180bfd00d2f49b1e7
Auto-generated-cl: translation import
 2012-11-14 10:13:51 -08:00
Baligh Uddin
2303f4242f Import translations. DO NOT MERGE 
Change-Id: I44ee12f2a6399347b884f91259117be4774b964b
Auto-generated-cl: translation import
 2012-11-14 10:11:28 -08:00
Andreas Huber
99a86d0633 Clarify that MediaFormat.KEY_IS_ADTS only applies to decoding AAC audio content 
and cannot be used to configure the _encoder_ to emit ADTS content.

Change-Id: I47177099b204027b726b2c7ec9b93be6835d88f6
related-to-bug: 7542186
 2012-11-14 09:16:59 -08:00
Jeff Sharkey
53f6e8a9b9 Utility to format human-friendly durations. 
Bug: 6777872
Change-Id: Ie7ebcb456306f4f88b4707030dd7beda3fc90368
 2012-11-13 17:26:39 -08:00
Victoria Lease
61ecb02f54 Resolve LocationManager + ActivityManager conflict 
LocationManagerService was serially stuffing the same Location into
multiple Intents, which it would immediately hand off to
ActivityManagerService, running as a different thread in the same
process. LocationManager would continue to work with that Location
while ActivityManagerService worked with a Parceled version of it.

However, Location.mExtras is also a Bundle, and both
ActivityManagerService and LocationManagerService ended up working
with references to the same Bundle. ActivityManagerService needs
it in Parceled form (ie mParceledData != null), but
LocationManagerService was triggering Bundle.unparcel() when
referencing the data contained within.

As a result, LocationManagerService was able to trigger NPE (or
worse) in ActivityManagerService by manipulating the mExtras
member of a Location that was in the process of being reported to
listeners.

To resolve this issue, I copy-construct a new Location to report to
each listener. This should prevent ActivityManagerService and
LocationManagerService from referencing the same Bundle data, as
Location's copy constructor also copyconstructs the mExtras member,
rather than simply share references.

Bug: 7518371
Change-Id: I1a92615cba361831494447d5de085a8d910b6b2c
 2012-11-13 15:12:51 -08:00
Zhihai Xu
4e22ad3504 Settings shows it is connected to A2DP, though the device is not actually connected 
the root cause is the A2dp and Pbap service need receive STATE_TURNING_OFF intent
to shutdown cleanly. So we need send completely state transition intents
in user switch handler.

bug7403171

Change-Id: Ic92bc85c2b74ae7c95440b237ea8851771ee9f04
 2012-11-13 15:11:26 -08:00
Joe Malin
faa38a08d5 am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '4422596ddb295f812bb0970ec7f75d3c45d05020':
  Notification.java javadoc: addAction
 2012-11-13 14:26:44 -08:00
Joe Malin
4422596ddb am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
  Notification.java javadoc: addAction
 2012-11-13 14:25:09 -08:00
Joe Malin
ce37f1da36 am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
  Notification.java javadoc: addAction
 2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594 am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs 
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
  Notification.java javadoc: addAction
 2012-11-13 14:20:54 -08:00
Joe Malin
5f32d3375b Merge "Notification.java javadoc: addAction" into jb-dev-docs 2012-11-13 14:14:23 -08:00
Joe Fernandez
e05d4de55a am 9b703463: Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 
* commit '9b703463ebf67182e78dd2b05183636fbb37f3c9':
  docs: Update platform version page with 4.2 release
 2012-11-13 13:38:25 -08:00
Joe Fernandez
9b703463eb Merge "docs: Update platform version page with 4.2 release" into jb-mr1-dev 2012-11-13 13:36:01 -08:00
Joe Fernandez
3bdf4b6ca5 docs: Update platform version page with 4.2 release 
Change-Id: I98f8090a8cf8100584a428c407374d7188d1f42b
 2012-11-13 12:31:57 -08:00
Scott Main
17a3f233de am f20b146f: Merge "docs: add ndk tos wall" into jb-mr1-dev 
* commit 'f20b146fffdb672fb5b541d150240f8ef21a8710':
  docs: add ndk tos wall
 2012-11-13 11:42:53 -08:00
Scott Main
f20b146fff Merge "docs: add ndk tos wall" into jb-mr1-dev 2012-11-13 11:41:14 -08:00
Scott Main
66e642b6d0 docs: add ndk tos wall 
Change-Id: Ic7338d7d3606a017c84ce9895dfe68f2b931d182
 2012-11-13 11:24:35 -08:00
Fabrice Di Meglio
9d82d324de Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev 2012-11-13 11:03:19 -08:00
Michael Jurka
c1d5db7963 Merge "Add xxhdpi version of default activity icon" into jb-mr1.1-dev 2012-11-13 10:36:26 -08:00
Craig Mautner
c10914ca5c Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev 2012-11-13 10:00:04 -08:00
Dirk Dougherty
ed41bc2281 am c178ebe7: Merge "Doc change: update image for landing page." into jb-mr1-dev 
* commit 'c178ebe719b80418cb193865ef68bb21cd5b7a1b':
  Doc change: update image for landing page.
 2012-11-13 09:25:46 -08:00
Dirk Dougherty
c178ebe719 Merge "Doc change: update image for landing page." into jb-mr1-dev 2012-11-13 09:23:50 -08:00
Dirk Dougherty
b5e15cab4b Doc change: update image for landing page. 
Change-Id: I8e88b3972c5597e0510b94938572b7219eecba46
 2012-11-13 09:21:00 -08:00
Scott Main
a9e608980e am bd2b5313: Merge "docs: edits" into jb-mr1-dev 
* commit 'bd2b531359d7402b742c4a126ff1c0782107ab79':
  docs: edits
 2012-11-13 09:13:41 -08:00
Scott Main
bd2b531359 Merge "docs: edits" into jb-mr1-dev 2012-11-13 09:10:21 -08:00
Scott Main
ca211c7429 docs: edits 
Change-Id: I6a9f22100a138c594993cd9e0c1edfe0bb33affa
 2012-11-13 09:08:42 -08:00
Baligh Uddin
9885af0558 am 9508e31d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9508e31dcd41bbdbff255913b72489af95e9bd0c':
  Import translations. DO NOT MERGE
 2012-11-13 08:53:29 -08:00
Baligh Uddin
9508e31dcd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-13 08:50:51 -08:00
Craig Mautner
2c37f7b455 Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev 2012-11-13 08:27:22 -08:00
Scott Main
03fb5698ba am 574c2cbf: Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev 
* commit '574c2cbfb628e58c8b9ab28a4d7483c4024cef56':
  docs: add templated tabs for jb highlights
 2012-11-13 07:46:50 -08:00
Scott Main
574c2cbfb6 Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev 2012-11-13 07:42:57 -08:00
Scott Main
5617b06917 docs: add templated tabs for jb highlights 
Change-Id: I2353ec2bf96b5c0da46a2803639ef607fd12e167
 2012-11-13 07:39:35 -08:00
Dirk Dougherty
98fc49ab16 am 64b12118: Doc change: edits and landing page. 
* commit '64b12118ba74762e22ea186eca5ffcbc8b4acd14':
  Doc change: edits and landing page.
 2012-11-13 07:22:06 -08:00
Dirk Dougherty
64b12118ba Doc change: edits and landing page. 
Change-Id: Id79387c68771452dc091bbb2f8a576f33ecef68e
 2012-11-13 07:14:12 -08:00
Dirk Dougherty
56411cc37b am b4d28dbf: Merge "Doc change: image optimizations for docs." into jb-mr1-dev 
* commit 'b4d28dbf77d6983ed6b6f52e0a05da9c8be5ee85':
  Doc change: image optimizations for docs.
 2012-11-13 06:55:28 -08:00
Dirk Dougherty
b4d28dbf77 Merge "Doc change: image optimizations for docs." into jb-mr1-dev 2012-11-13 06:53:15 -08:00
Scott Main
4cddf7fbfb am 5878e2b3: Merge "docs: fix bug with unknown anchors" into jb-mr1-dev 
* commit '5878e2b32979d49e54711bfbe52d126c34fd24f4':
  docs: fix bug with unknown anchors
 2012-11-13 06:22:29 -08:00
Scott Main
f8dbf3758c am 2c7e6cb7: Merge "docs: add tabs to JB highlights" into jb-mr1-dev 
* commit '2c7e6cb773fb88f7e89fecf1b6dddf439cb9ec58':
  docs: add tabs to JB highlights
 2012-11-13 06:22:24 -08:00
Dirk Dougherty
8ae77b6747 am 23492df7: Doc change: resize some assets for highlights. 
* commit '23492df77f535133de7132c57610206ffc9ca17a':
  Doc change: resize some assets for highlights.
 2012-11-13 06:22:20 -08:00
Dirk Dougherty
6293affa35 am e320ac7a: Merge "Doc change: edits to highlights files." into jb-mr1-dev 
* commit 'e320ac7a2bc0fb2c6a2358f8a0723fb8c068176f':
  Doc change: edits to highlights files.
 2012-11-13 06:22:15 -08:00
Scott Main
5878e2b329 Merge "docs: fix bug with unknown anchors" into jb-mr1-dev 2012-11-13 05:59:17 -08:00
Scott Main
3a535a47c3 docs: fix bug with unknown anchors 
Change-Id: I70f978ffd2248973a43ff1fe1dec2b0ac78cb63b
 2012-11-13 05:58:23 -08:00
Dirk Dougherty
5ac04f38a0 Doc change: image optimizations for docs. 
Change-Id: I33fbdcf11ec7cd6140d287184392866926f05551
 2012-11-13 05:37:11 -08:00
Scott Main
2c7e6cb773 Merge "docs: add tabs to JB highlights" into jb-mr1-dev 2012-11-13 05:34:05 -08:00
Scott Main
0d881cb58c docs: add tabs to JB highlights 
Change-Id: Ia8e04f54678ea51a8ca50bf3b51f9a6cfd86d2da
 2012-11-13 05:29:39 -08:00