162561 Commits

Author SHA1 Message Date
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
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
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
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
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
Rachad
6d3cff1264 Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-dev 2015-01-10 01:23:35 +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
Eric Laurent
6fa4245589 AudioService: send connection intent for HDMI ARC device
Bug: 18921279.
Change-Id: I1e23b5aed7a2835feb0fea2a412f3622c01cbe55
2015-01-09 15:09:40 -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
68dabada9e am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev
* commit 'a97fe1387df731ddbbdae7c75dfbdfa4f1eb0339':
  Exclude ephemeral networks from wifi backup
2015-01-09 20:16:21 +00:00
Christopher Tate
a97fe1387d Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 2015-01-09 20:10:21 +00:00
Jeff Sharkey
0cb736f754 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev
* commit '2b46774ff950270365238e12e4a336e2004500e2':
  Guard against MountService throwing NPE.
2015-01-09 19:21:24 +00:00
Jeff Sharkey
2b46774ff9 Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 2015-01-09 19:14:29 +00:00
Dianne Hackborn
a319aa800d Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev
automerge: 54f9b1e

* commit '54f9b1eedc86a3066bedf3d8ea3e8ffbb83cb678':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
2015-01-09 19:11:44 +00:00
Dianne Hackborn
54f9b1eedc Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 2015-01-09 19:08:50 +00:00
Prashant Malani
ea481beda6 Improve the circularMask for round displays
The mask was earlier drawn as a thin ring at the display periphery.
This had undesirable effects when screenshots were taken, as the ring
was seen, as well as display content beyond it.

This patch modifies the mask to be a black canvas with portions erased
to improve the screenshot image.

Bug: 18772987
Change-Id: I25ef6387879613354308e015446fe325ed8c4515
2015-01-09 11:07:03 -08:00
Ariel Gertzenstein
b32831eebf Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev
automerge: cce8db2

* commit 'cce8db2c31a03d0c4e04f5851415d37032ae6621':
  Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
2015-01-09 17:59:15 +00:00
Ariel Gertzenstein
cce8db2c31 Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524" into lmp-mr1-dev 2015-01-09 17:56:11 +00:00
Dianne Hackborn
b3d4cb369e Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
2015-01-09 09:54:06 -08:00
Ariel Gertzenstein
2999acb0ce Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." as it reintroduces b/18922524
This reverts commit bde7bc45af2bb7f9bee8096d45973f25cc00c5db.

Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991
2015-01-09 17:45:40 +00:00
Robin Lee
34f3adedcc am 7f7ea82c: Profile owner hint in warning for extra CAs
* commit '7f7ea82c28f01798b15686aa45733885beebcc6e':
  Profile owner hint in warning for extra CAs
2015-01-09 15:12:24 +00:00
Robin Lee
7f7ea82c28 Profile owner hint in warning for extra CAs
The version of the warning with a named installer should be shown in
the case of a managed profile, not only a managed device.

Bug: 18224038
Change-Id: I27865f77e963b9b15416f2e4a4ffc38fed8f5532
2015-01-09 11:25:04 +00:00
Jinsuk Kim
e26d833c4a CEC: Keep Playback device awake while it is the active source
Alleviates the user experience issue of having to turn on the device
manually when it goes to standby mode while the device occupies
the display.

Bug: 18882764
Change-Id: I10b239a599a310e47e3c2cb98737e4b0fdb4e435
2015-01-09 15:07:39 +09:00
Christopher Tate
cab915a327 Exclude ephemeral networks from wifi backup
We compare the set of networks defined in the supplicant with the
set of networks described as "configured" by the Wifi Manager.  The
latter excludes ephemeral networks, so any network definition we
find in the supplicant data that we do not also find in the
configured network set, we ignore for backup purposes.

Bug 18917753

Change-Id: I8e0f258d0cdb72d7bf9482fafe64dc921419fcb2
2015-01-08 19:05:04 -08:00
Shishir Agrawal
2db79771b6 am bde7bc45: GpsLocationProvider: Read data enabled status from TelephonyManager.
* commit 'bde7bc45af2bb7f9bee8096d45973f25cc00c5db':
  GpsLocationProvider: Read data enabled status from TelephonyManager.
2015-01-09 01:35:16 +00:00
Shishir Agrawal
bde7bc45af GpsLocationProvider: Read data enabled status from TelephonyManager.
Bug: 18814559
Change-Id: Ie8edde652565aca2e2a1935ed42eb927b7d26baa
2015-01-08 16:04:24 -08:00
Robin Lee
bc7efed694 am 2cc617b2: Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev
* commit '2cc617b2adcd3c54837a251b688e909e3224a5e4':
  Revert "Profile owner hint in warning for extra CAs"
2015-01-08 22:38:22 +00:00
Robin Lee
2cc617b2ad Merge "Revert "Profile owner hint in warning for extra CAs"" into lmp-mr1-dev 2015-01-08 22:31:36 +00:00
Robin Lee
e53b7dd066 Revert "Profile owner hint in warning for extra CAs"
This reverts commit e1d8dcd9e170c1ed8a13b6e1256ea1fb22c26c49.

Something funny happened in the process of submitting this,
swathes of strings.xml became mis-encoded.

Bug: 18224038
Change-Id: I0276ff3f880fe749546e8cc7e3e2f41c22c27705
2015-01-08 22:08:42 +00:00
Jeff Sharkey
9708669b2f Guard against MountService throwing NPE.
Fall through to below logic and return null instead of crashing the
entire app.  We already tell developers the value may be null.

Bug: 17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
2015-01-08 14:00:15 -08:00
Dianne Hackborn
16e4324dd9 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev
* commit 'cb8d8e10b0c1163914aca85f8e3b73a0cac86fb4':
  Fix issue #18827122: system server crashed on broadcasting...
2015-01-08 21:46:53 +00:00
Dianne Hackborn
cb8d8e10b0 Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 2015-01-08 21:41:35 +00:00
Lajos Molnar
92160ba97d am 31ef8ef5: Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev
* commit '31ef8ef5d0f98aa08b4c8247d1f252379d97a548':
  Use NULL instead of 0 when invoking CallStaticVoidMethod
2015-01-08 20:24:33 +00:00
Lajos Molnar
31ef8ef5d0 Merge "Use NULL instead of 0 when invoking CallStaticVoidMethod" into lmp-mr1-dev 2015-01-08 20:19:00 +00:00