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

172989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Laurent
695233fe83 Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev 2015-01-12 15:39:45 +00:00
Neil Fuller
837261cc99 Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 2015-01-12 14:50:36 +00: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
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
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
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
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
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