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
Eric Gilmore
7862ba297f am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
* commit '6c8b80acbb456b5b537137a181dc2ad4cbd07adc':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 16:26:43 +00:00
Geoff Mendal
83c2c049bc am 3d9875f4: (-s ours) Import translations. DO NOT MERGE 
* commit '3d9875f477013305e3033197b0d6fb3a940f38b2':
  Import translations. DO NOT MERGE
 2015-01-12 16:26:06 +00:00
Eric Laurent
f67278306b am 695233fe: Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev 
* commit '695233fe83152832db26e123aabde850850c4333':
  AudioService: send connection intent for HDMI ARC device
 2015-01-12 16:26:01 +00:00
Jason Monk
3454612e2c am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 
* commit 'd74a331ae16b17cf1967186b5392676d2e3c427c':
  Avoid showing emergency calls when not possible
 2015-01-12 16:25:56 +00:00
Geoff Mendal
3d9875f477 Import translations. DO NOT MERGE 
Change-Id: I58457a1543f87145ae4a2c3292e49465939f715d
Auto-generated-cl: translation import
 2015-01-12 16:07:33 +00:00
Neil Fuller
560ed859bc Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 2015-01-12 16:06:43 +00:00
Neil Fuller
b7260cbcc4 Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade. 
OkHttp recently changed the behavior of their caching with
commit e74e3f3bf744ef7f4d8ee724a7cf2347e486cfab - it is now
neccessary to close the inputstream (or disconnect the
HttpURLConnection) for a response to be cached.

This change is (effectively) a no-op prior to the upgrade.

The behavior is undefined as to whether closing the
input stream is required for caching. OkHttp's new behavior
is consistent with other HttpURLConnection implementations
tried.

(cherry-picked from commit 62d0677b0f6cc5ae48fd0b816ea5caad82264fd6)

Change-Id: Ibe698a443ec98866787ed9da2698322fab856518
 2015-01-12 16:05:26 +00:00
Eric Laurent
695233fe83 Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev 2015-01-12 15:39:45 +00:00
Geoff Mendal
91a9bfc346 Merge "Import translations. DO NOT MERGE" 2015-01-12 15:10:53 +00:00
Geoff Mendal
07adc61c66 Import translations. DO NOT MERGE 
Change-Id: I819509b5730478b287816b9f6f8c09623bd12dd2
Auto-generated-cl: translation import
 2015-01-12 07:10:22 -08:00
Neil Fuller
837261cc99 Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 2015-01-12 14:50:36 +00:00
Geoff Mendal
881f8d1ee3 Import translations. DO NOT MERGE 
Change-Id: Ic7e685a040aabf416658ed9d70fbbdef047f7cb9
Auto-generated-cl: translation import
 2015-01-12 06:49:42 -08:00
Jason Monk
d74a331ae1 Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 2015-01-12 14:01:04 +00:00
Olawale Ogunwale
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +00:00
Olawale Ogunwale
e3f8598547 Merge "bindService can't start up service process" 2015-01-12 13:44:35 +00:00
Olawale Ogunwale
8ddd5f4cd6 Merge "[ActivityManager] Fix process record leakage." 2015-01-12 13:44:17 +00:00
Etan Cohen
cd0555f273 am f428db20: am 16918817: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev automerge: b4eb723 
* commit 'f428db20d0db356d8afb05a3a0d9aa23f27702a3':
  Added configuration to determine whether VoLTE requires provisioning.
 2015-01-11 19:29:00 +00:00
Etan Cohen
f428db20d0 am 16918817: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
automerge: b4eb723

* commit 'b4eb72322fb26b08c781f051651ec5106725c80f':
  Added configuration to determine whether VoLTE requires provisioning.
 2015-01-11 19:21:34 +00:00
Etan Cohen
b4eb72322f am 16918817: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
* commit '1691881763295cc254ea618958bdcee83ebeccd8':
  Added configuration to determine whether VoLTE requires provisioning.
 2015-01-11 19:19:22 +00:00
Etan Cohen
1691881763 Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 2015-01-11 19:10:22 +00:00
Jinsuk Kim
740df4845d am c7325cd3: am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev automerge: 258b941 
* commit 'c7325cd3576f7e2bc25b4c49c53d5bc5e5af9938':
  CEC: Keep Playback device awake while it is the active source
 2015-01-10 22:12:56 +00:00
Jinsuk Kim
c7325cd357 am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 
automerge: 258b941

* commit '258b9418905de33f1b6f8461d79c8e39be7a50a5':
  CEC: Keep Playback device awake while it is the active source
 2015-01-10 22:07:03 +00:00
Jinsuk Kim
258b941890 am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 
* commit 'f94d5d26f2d122cbb41327d8e34d8655514f9b0c':
  CEC: Keep Playback device awake while it is the active source
 2015-01-10 22:04:27 +00:00
Jinsuk Kim
f94d5d26f2 Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev 2015-01-10 21:59:40 +00:00
Deepanshu Gupta
fa4697e247 am 2a9abb34: am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a automerge: db343ec 
automerge: c2d2272

* commit 'c2d22720420e1128876d3b99f52ddba8c0ddd074':
 2015-01-10 11:29:04 +00:00
Deepanshu Gupta
43680f0bbe am f58aa342: am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d automerge: 3279949 
automerge: 8d34b1e

* commit '8d34b1e805c5b5fd05c78899f6ff3eb08d19ab1a':
 2015-01-10 11:27:35 +00:00
Deepanshu Gupta
0b104dd5b1 am de8b66ff: am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 automerge: 8e65d92 
automerge: 9cc4357

* commit '9cc4357ace6a88431654ba038cf0f9bfe3ec650f':
 2015-01-10 11:26:22 +00:00
Deepanshu Gupta
c2d2272042 am 2a9abb34: am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a 
automerge: db343ec

* commit 'db343ecae8671eef0b945e08cf71ad6eb8a6a9e7':
 2015-01-10 10:29:18 +00:00
Deepanshu Gupta
8d34b1e805 am f58aa342: am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
automerge: 3279949

* commit '327994977fa865421c522cf089a2692b2c837ed5':
 2015-01-10 10:27:54 +00:00
Deepanshu Gupta
9cc4357ace am de8b66ff: am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
automerge: 8e65d92

* commit '8e65d92e368e1f9ec21926e1ece2d929237da150':
 2015-01-10 10:26:41 +00:00
Deepanshu Gupta
db343ecae8 am 2a9abb34: am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a 
* commit '2a9abb34d8be77b1dbacb5282480e39deae5d9a1':
 2015-01-10 10:25:15 +00:00
Deepanshu Gupta
327994977f am f58aa342: am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
* commit 'f58aa342832e69896c21d13d66e6975672af08ff':
 2015-01-10 10:25:10 +00:00
Deepanshu Gupta
8e65d92e36 am de8b66ff: am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
* commit 'de8b66ffefc2f59accd66787133a5eea3cbd61f2':
 2015-01-10 10:25:05 +00:00
Deepanshu Gupta
2a9abb34d8 am aadcdef3: am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a 
* commit 'aadcdef312bac520e5352d687a642a87faf3c654':
 2015-01-10 10:19:28 +00:00
Deepanshu Gupta
f58aa34283 am 686160b8: am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
* commit '686160b854e845b79f74a526b397bb6dc438392b':
 2015-01-10 10:19:24 +00:00
Deepanshu Gupta
de8b66ffef am 7aafa4fd: am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
* commit '7aafa4fd31d9a42fe0cd9a8e2e6aa8a4728ec166':
 2015-01-10 10:19:20 +00:00
Deepanshu Gupta
aadcdef312 am 191d06b5: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de automerge: 8d9361a 
* commit '191d06b55598b653e0764638ca37d8618c9d085e':
 2015-01-10 10:13:04 +00:00
Deepanshu Gupta
686160b854 am 74e00d22: Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 automerge: 7da2b5d 
* commit '74e00d229b5e4fca4bffd94373d58f94a74255d5':
 2015-01-10 10:13:00 +00:00
Deepanshu Gupta
7aafa4fd31 am 38884a30: LayoutLib: Fix System.arraycopy() automerge: 51fb775 automerge: 55c7bd4 
* commit '38884a30dfe0fffce0c6097fd9d406e45d04aea5':
 2015-01-10 10:12:56 +00:00
Deepanshu Gupta
191d06b555 am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: bb600de 
automerge: 8d9361a

* commit '8d9361a4ec1260b268865af6dcc8b2c5bb316f9d':
 2015-01-10 09:49:53 +00:00
Deepanshu Gupta
74e00d229b Support Locale.toLanguageTag on Java 6 automerge: dbd64f7 
automerge: 7da2b5d

* commit '7da2b5dbc259ef026bb075905f9fda3695dd4615':
 2015-01-10 09:48:39 +00:00
Deepanshu Gupta
38884a30df LayoutLib: Fix System.arraycopy() automerge: 51fb775 
automerge: 55c7bd4

* commit '55c7bd4dac3078ab220823e522c9257246933c46':
 2015-01-10 09:47:08 +00:00
Deepanshu Gupta
8d9361a4ec am 74147527: am 8505c387: Special case AppCompat to show action bar. 
automerge: bb600de

* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.
 2015-01-10 04:59:11 +00:00
Deepanshu Gupta
7da2b5dbc2 Support Locale.toLanguageTag on Java 6 
automerge: dbd64f7

* commit 'dbd64f7c904287f9e1bf5bb22385aace85274cab':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:57:42 +00:00
Deepanshu Gupta
55c7bd4dac LayoutLib: Fix System.arraycopy() 
automerge: 51fb775

* commit '51fb7754fc9a232a225b31b37219f4b0dcba6711':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:56:36 +00:00
Etan Cohen
038c3d21a7 Added configuration to determine whether VoLTE requires provisioning. 
Bug: 18576107
Change-Id: I08c231a3d876f3fe92c0fcb7f52be878b2da00dd
 2015-01-10 04:26:22 +00:00
Deepanshu Gupta
c8807ebbd2 am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: 8e2dd14 
automerge: 2223018

* commit '22230189be8e811881ba24de1cde97f9882a7d45':
  Special case AppCompat to show action bar.
 2015-01-10 04:24:44 +00:00
Deepanshu Gupta
dbf1c7be1b am cd2e4da9: am 20625cce: am c5871ea1: am dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6 automerge: 2bc2a40 
automerge: 58ade15

* commit '58ade15bcc33fc8d5ade4a26b404c453eedf0cf1':
  Support Locale.toLanguageTag on Java 6
 2015-01-10 04:23:14 +00:00
Deepanshu Gupta
68fcc01aa8 am b752d972: am b3d418ad: am db703ab6: am 51fb7754: (-s ours) LayoutLib: Fix System.arraycopy() automerge: 789a992 
automerge: f922a32

* commit 'f922a329aab080938d2c0872dc79bbb5fe08ef44':
  LayoutLib: Fix System.arraycopy()
 2015-01-10 04:21:56 +00:00
Deepanshu Gupta
22230189be am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
automerge: 8e2dd14

* commit '8e2dd14e7d327f3d92d57092c24ea2064f04fd1c':
  Special case AppCompat to show action bar.
 2015-01-10 04:14:54 +00:00