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

179953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
58ade15bcc am cd2e4da9: am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
automerge: 2bc2a40

* commit '2bc2a4064ae60c1448eaae112cf6f3df4d8f2daa':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:13:34 +00:00
Deepanshu Gupta
8e2dd14e7d am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'f2e04ac7ea1cc2f91ca1562a14c7e0c261f869fe':
  Special case AppCompat to show action bar.
 2015-01-10 04:10:07 +00:00
Deepanshu Gupta
2bc2a4064a am cd2e4da9: am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit 'cd2e4da9a77396554b274cd79f64b37cadfac282':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:10:02 +00:00
Deepanshu Gupta
f922a329aa am b752d972: am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
automerge: 789a992

* commit '789a9926ad72b1e9349148db17f0b8631e37c74b':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:07:07 +00:00
Deepanshu Gupta
789a9926ad am b752d972: am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit 'b752d9724871e1ede0d16a7af8f22b2d67bbe5d8':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:05:33 +00:00
Deepanshu Gupta
f2e04ac7ea am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'c598047d67f64e690f682d82c0e77989c79ae465':
  Special case AppCompat to show action bar.
 2015-01-10 04:04:22 +00:00
Deepanshu Gupta
cd2e4da9a7 am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit '20625cce4c13d2337456aaa74ba91b6c4379321f':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:04:18 +00:00
Deepanshu Gupta
b752d97248 am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit 'b3d418ad027c324c1169e7087689a81bfefdf7f3':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 03:59:58 +00:00
Deepanshu Gupta
c598047d67 am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'ca67a249293d021808f349fa2e2f799451aeafe8':
  Special case AppCompat to show action bar.
 2015-01-10 03:56:47 +00:00
Deepanshu Gupta
20625cce4c am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit 'c5871ea1b830153e7f85367844bcc67b81a2c06b':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 03:56:44 +00:00
Deepanshu Gupta
b3d418ad02 am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit 'db703ab64643ef91bbdb989a04597ecf7d0ca928':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 03:52:05 +00:00
Deepanshu Gupta
ca67a24929 am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.
 2015-01-10 03:51:05 +00:00
Deepanshu Gupta
c5871ea1b8 am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 
* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 03:51:01 +00:00
Deepanshu Gupta
db703ab646 am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() 
* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 03:43:48 +00:00
Lajos Molnar
530a2b70fa am e332f2a7: am d289a78c: am 7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly" 
* commit 'e332f2a7fa4b3c5dde3dc4fdf1062ed22d8bb6c4':
  MediaCodec/Image: handle null cropRect correctly
 2015-01-10 02:22:55 +00:00
Lajos Molnar
a1ec0bcec5 am 48948e10: am f3694fc1: am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec" 
* commit '48948e10b33b578a6ac405a15740f72574b54a2b':
  media: add support for 160-byte image info in MediaCodec
 2015-01-10 02:22:51 +00:00
Deepanshu Gupta
bb600de6e7 am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit '74147527357b9abd9d30b3a2dbd72a5172a35625':
  Special case AppCompat to show action bar.
 2015-01-10 02:16:44 +00:00
Paul Jensen
7c9512cb2d am 2a41b761: am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev automerge: 63e2b8e 
* commit '2a41b761866f12f67fdf50efb76dd72e403ff1c2':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2015-01-10 02:15:17 +00:00
Lajos Molnar
e332f2a7fa am d289a78c: am 7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly" 
* commit 'd289a78c4745e219af493f59c5f174503685278d':
  MediaCodec/Image: handle null cropRect correctly
 2015-01-10 02:14:35 +00:00
Lajos Molnar
48948e10b3 am f3694fc1: am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec" 
* commit 'f3694fc139525ae45955087a0e4f15a15ed6e202':
  media: add support for 160-byte image info in MediaCodec
 2015-01-10 02:14:29 +00:00
Deepanshu Gupta
7414752735 am 8505c387: Special case AppCompat to show action bar. 
* commit '8505c3870a17f41d23329344fe381cd9ff324bd2':
  Special case AppCompat to show action bar.
 2015-01-10 02:10:55 +00:00
Paul Jensen
2a41b76186 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
automerge: 63e2b8e

* commit '63e2b8e058f379582d0325aa84b5de6bfa73e15b':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2015-01-10 02:08:59 +00:00
Paul Jensen
63e2b8e058 am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
* commit '60944390cde10c44064f1eda67eae5d76598f0d8':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2015-01-10 02:06:06 +00:00
Paul Jensen
60944390cd Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 2015-01-10 01:59:45 +00:00
Deepanshu Gupta
dbd64f7c90 Support Locale.toLanguageTag on Java 6 
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)
 2015-01-09 17:43:12 -08:00
Rachad
9eed8f9a5e am 2a7991ee: am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev automerge: b60bb35 
* commit '2a7991ee2f331c242ff9f7b87058e64b50a616fd':
  MediaCodec: Added E-AC3 mime type (@hide).
 2015-01-10 01:37:29 +00:00
Rachad
2a7991ee2f am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev 
automerge: b60bb35

* commit 'b60bb35650c7075bc66bf2b8f5c0fbe428092010':
  MediaCodec: Added E-AC3 mime type (@hide).
 2015-01-10 01:31:01 +00:00
Rachad
b60bb35650 am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev 
* commit '6d3cff12648f8ca3bcc0ac190d1d6d2e49514b66':
  MediaCodec: Added E-AC3 mime type (@hide).
 2015-01-10 01:27:31 +00:00
Lajos Molnar
d289a78c47 am 7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly" 
* commit '7f94b52fc7c66bc40702b46f59b3929c076cbbfb':
  MediaCodec/Image: handle null cropRect correctly
 2015-01-10 01:26:02 +00:00
Lajos Molnar
f3694fc139 am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec" 
* commit '98840f2bd2fb96225ed5c95644937d55d4189ca6':
  media: add support for 160-byte image info in MediaCodec
 2015-01-10 01:25:55 +00:00
Ruben Brunk
1bc109b928 am 8f8dc488: resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. 
* commit '8f8dc4882bc61b7e273ac991e2ae99834d55b7d0':
  Camera2: Fix early EOF in DngCreator#writeByteBuffer.
 2015-01-10 01:24:55 +00:00
Rachad
6d3cff1264 Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev 2015-01-10 01:23:35 +00:00
Ruben Brunk
8f8dc4882b resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. 
Change-Id: Idbf96ab23c02dc7c380d6c3a4a87b1f380446c61
 2015-01-09 17:19:45 -08:00
Lajos Molnar
7f94b52fc7 Merge "MediaCodec/Image: handle null cropRect correctly" 2015-01-10 01:12:33 +00:00
Lajos Molnar
98840f2bd2 Merge "media: add support for 160-byte image info in MediaCodec" 2015-01-10 01:10:24 +00:00
Deepanshu Gupta
51fb7754fc LayoutLib: Fix System.arraycopy() 
Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.

Note that this was already being done for char.

Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
(cherry picked from commit e1960cc0b541cda93db94de5bef42dff922b9ec3)
 2015-01-09 17:03:54 -08:00
Deepanshu Gupta
8505c3870a Special case AppCompat to show action bar. 
Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b
 2015-01-10 00:29:52 +00:00
Ruben Brunk
0f647c19f9 am 8c52d9a0: Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev 
* commit '8c52d9a092452837e7222d8416c3b4accf9a99d7':
  Camera2: Fix early EOF in DngCreator#writeByteBuffer.
 2015-01-09 23:37:07 +00:00
Ruben Brunk
8c52d9a092 Merge "Camera2: Fix early EOF in DngCreator#writeByteBuffer." into lmp-mr1-dev 2015-01-09 23:33:49 +00:00
ztenghui
5a880611cc Merge "Limit the scope of clip path to the group, not global" 2015-01-09 23:16:23 +00:00
Paul McLean
96798efe99 Merge "Support for simultaneous USB Audio Devices connect/disconnect" 2015-01-09 23:12:37 +00:00
Eric Laurent
6fa4245589 AudioService: send connection intent for HDMI ARC device 
Bug: 18921279.
Change-Id: I1e23b5aed7a2835feb0fea2a412f3622c01cbe55
 2015-01-09 15:09:40 -08:00
Paul McLean
0a8f06922f Support for simultaneous USB Audio Devices connect/disconnect 
Attach/Detach logic
Decoupling card# and list index
Modern loop constructs
Consistent logging flags
Add class/type flags to device "address" string.
Factored UsbAudioDevice out of UsbAudioManager.

Bug: 18399845
Bug: 18717784

Change-Id: I6f185e1c24091d4c0d21eb7e922a1496748d32c3
 2015-01-09 14:56:43 -08:00
ztenghui
054a17caaa Limit the scope of clip path to the group, not global 
http://b/18758765

Change-Id: I899401a5fcbccd0421687bd5cf671f7751092195
 2015-01-09 14:53:47 -08:00
Eric Gilmore
6c8b80acbb Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 2015-01-09 22:42:47 +00:00
Ruben Brunk
a3fdec8dac Camera2: Fix early EOF in DngCreator#writeByteBuffer. 
Bug: 18962278
Change-Id: I8641a03d866930c86bdd2db0a29ccd5560712c90
 2015-01-09 13:48:31 -08:00
Eric Gilmore
46f751864b Adding Android Fundamentals video. 
Bug: 18820337
Change-Id: I758de61902f375d02219414999ea7833b5787474
 2015-01-09 13:22:59 -08:00
Jason Monk
6c985dcc2d Carrier text handle sim removal 
Have KeyguardUpdateMonitor send the onRefreshCarrierInfo when the
subscription info changes, regardless of whether there are any
subscriptions (because there might be no sims).

Bug: 18752587
Change-Id: I8976c76aae9e3e633b6adace48dccb1e940dbc18
 2015-01-09 16:07:14 -05:00
Christopher Tate
0c3e78c93f am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev automerge: 68dabad 
automerge: f3ac99f

* commit 'f3ac99f2e093f851ca52bcd5aefb251046db10fa':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:25:31 +00:00
Christopher Tate
f3ac99f2e0 am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
automerge: 68dabad

* commit '68dabada9e6e380ec0c6dacbc2ce7a46aa663a07':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:20:01 +00:00