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

180534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
5eaa1f952f Merge "Import translations. DO NOT MERGE" 2015-01-21 15:31:49 +00:00
Geoff Mendal
ae0b0167bc Import translations. DO NOT MERGE 
Change-Id: I03276ec800985dbd5519945587620f52d6fed25a
Auto-generated-cl: translation import
 2015-01-21 07:30:19 -08:00
Geoff Mendal
703e20fea7 Merge "Import translations. DO NOT MERGE" 2015-01-21 15:21:26 +00:00
Geoff Mendal
3fb2f6594e Import translations. DO NOT MERGE 
Change-Id: I6f5eaee0cfc5d0fd3995c600fb5eaf0afa032d4d
Auto-generated-cl: translation import
 2015-01-21 07:19:12 -08:00
Geoff Mendal
2d71728028 Merge "Import translations. DO NOT MERGE" 2015-01-21 14:57:39 +00:00
Geoff Mendal
bba3fb904f Merge "Import translations. DO NOT MERGE" 2015-01-21 14:56:50 +00:00
Geoff Mendal
11faf11852 Merge "Import translations. DO NOT MERGE" 2015-01-21 14:55:23 +00:00
Geoff Mendal
c602099af4 Import translations. DO NOT MERGE 
Change-Id: I6272a8580b7a346ace41eadaabfda9de0fe81cb3
Auto-generated-cl: translation import
 2015-01-21 06:50:23 -08:00
Geoff Mendal
f66949ebd4 Import translations. DO NOT MERGE 
Change-Id: Ida34896ac8597930db790a14bc84cd19452f6902
Auto-generated-cl: translation import
 2015-01-21 06:45:08 -08:00
Geoff Mendal
dee11b8d17 Import translations. DO NOT MERGE 
Change-Id: I69ace6aac5ffcb881daa299279ad006a08f0f768
Auto-generated-cl: translation import
 2015-01-21 06:42:19 -08:00
Geoff Mendal
d18f9f5670 Merge "Import translations. DO NOT MERGE" 2015-01-21 14:36:44 +00:00
Geoff Mendal
596bf7a3e1 Import translations. DO NOT MERGE 
Change-Id: I3ed20770355daeb44c7ec26a0cd70d224dde7e9b
Auto-generated-cl: translation import
 2015-01-21 06:34:11 -08:00
Geoff Mendal
f4d6144fec Import translations. DO NOT MERGE automerge: af69fcd -s ours automerge: 45c5f9d -s ours 
automerge: 4196fc5  -s ours

* commit '4196fc56bcee78eba4a204d80a62d9ad0c77022f':
  Import translations. DO NOT MERGE
 2015-01-21 14:30:47 +00:00
Geoff Mendal
4196fc56bc Import translations. DO NOT MERGE automerge: af69fcd -s ours 
automerge: 45c5f9d  -s ours

* commit '45c5f9d195a4522fdf13915052fe509bbfd80688':
  Import translations. DO NOT MERGE
 2015-01-21 14:26:54 +00:00
Geoff Mendal
45c5f9d195 Import translations. DO NOT MERGE 
automerge: af69fcd  -s ours

* commit 'af69fcd0bd4878145214dc16adbf5ef614e7f3a4':
  Import translations. DO NOT MERGE
 2015-01-21 14:19:37 +00:00
Geoff Mendal
af69fcd0bd Import translations. DO NOT MERGE 
Change-Id: I3d03c8e758bc8ecfe8e8b789fcfeab386e7eec9a
Auto-generated-cl: translation import
 2015-01-21 08:15:11 -06:00
Narayan Kamath
e383132ac5 Merge "Choose the right executable for wrapped applications." automerge: aa87e89 automerge: 4af0265 
automerge: ebc57c7

* commit 'ebc57c7471f1ebe56cae091707887be582b0db06':
  Choose the right executable for wrapped applications.
 2015-01-21 14:13:27 +00:00
Narayan Kamath
ebc57c7471 Merge "Choose the right executable for wrapped applications." automerge: aa87e89 
automerge: 4af0265

* commit '4af0265a35bcd8a0a7513dd85fe371597e2038c5':
  Choose the right executable for wrapped applications.
 2015-01-21 14:09:33 +00:00
Narayan Kamath
4af0265a35 Merge "Choose the right executable for wrapped applications." 
automerge: aa87e89

* commit 'aa87e89e81b547cc28e09a5f71adb288ee18b32a':
  Choose the right executable for wrapped applications.
 2015-01-21 14:05:29 +00:00
Narayan Kamath
aa87e89e81 Merge "Choose the right executable for wrapped applications." 2015-01-21 14:01:57 +00:00
Narayan Kamath
1ed78fbf28 Add library definition for org.apache.http.legacy. 
bug: 18027885
Change-Id: I300ab2eb0f87e004ef20157bd23517865133665c
 2015-01-21 12:49:14 +00:00
Jinsuk Kim
70523ec551 am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev automerge: f8d2f32 
automerge: 748e813

* commit '748e813ed7f9042eba6e64fced78e28b7c16327a':
  CEC: Switch active input after routing control
 2015-01-21 02:36:59 +00:00
Jinsuk Kim
748e813ed7 am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 
automerge: f8d2f32

* commit 'f8d2f3284f9613bc20967e19213573804ea0ab83':
  CEC: Switch active input after routing control
 2015-01-21 02:33:08 +00:00
Jinsuk Kim
f8d2f3284f am f23829d6: Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 
* commit 'f23829d64ff6fdae6f8b1d2b0fbe3f2715b313d4':
  CEC: Switch active input after routing control
 2015-01-21 02:16:37 +00:00
Jinsuk Kim
f23829d64f Merge "CEC: Switch active input after routing control" into lmp-mr1-dev 2015-01-21 02:10:54 +00:00
Johnson Hsieh
24c33d32cc Merge "Expose CommandRequest completion status." 2015-01-21 01:39:19 +00:00
Johnson Hsieh
dd32946def Expose CommandRequest completion status. 
Expose CommandRequest completion status in client api onCommandResult().

Change-Id: Ib2066b7ca6d7b1ae968da7e7686e34107dc7dfa8
 2015-01-20 17:11:50 -08:00
Dianne Hackborn
51ff482f02 Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev automerge: 66f8d9b automerge: 8781dbf 
automerge: 734f684

* commit '734f68439ed7e0fb6fbd521f961cebf31baf5b6d':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 01:10:18 +00:00
Dianne Hackborn
734f68439e Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev automerge: 66f8d9b 
automerge: 8781dbf

* commit '8781dbf3dfa79c39fc0410521dff04156fae876a':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 00:43:50 +00:00
Jinsuk Kim
337ce19bef CEC: Switch active input after routing control 
Makes sure the previous HDMI input gets switched to upon receiving
<Inactive Source> from the current active source device.

Bug: 18986597
Change-Id: I7120e81d75b5fd4cafd4b483e9b232b96e50f597
 2015-01-21 09:38:33 +09:00
Dianne Hackborn
8781dbf3df Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 
automerge: 66f8d9b

* commit '66f8d9bb693d5e410ac6f6ba3029cf6c7dc2f104':
  Fix issue #19020826: Including timing issues in ANR reason breaks clustering
 2015-01-21 00:27:47 +00:00
Dianne Hackborn
66f8d9bb69 Merge "Fix issue #19020826: Including timing issues in ANR reason breaks clustering" into lmp-mr1-dev 2015-01-21 00:23:53 +00:00
Geoff Mendal
75ee6e5ce0 Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 
automerge: 6bf768b

* commit '6bf768bf13ad663d556d88db392b73d45034f280':
 2015-01-21 00:15:58 +00:00
Craig Mautner
a30dc1709e am f1eb1cdc: am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
automerge: b880c75

* commit 'b880c75eeb48002169627a4b33dbafad3f047421':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-21 00:13:53 +00:00
Craig Mautner
b7dae3b565 am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
automerge: 07d2f0c

* commit '07d2f0cff4d08bec4ff5ea22f9c42532f3c83e35':
  More debugging for bug 17721767
 2015-01-21 00:11:23 +00:00
Christopher Tate
b6d4b350a1 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev automerge: 8192670 
automerge: ebdec3e

* commit 'ebdec3e0921d1495ca712f4f1f7755d975297d14':
  Don't launch broadcast receiver processes during boot
 2015-01-21 00:09:39 +00:00
Christopher Tate
98635ea392 Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6 automerge: 78a05de 
automerge: fb4fde7

* commit 'fb4fde7053ba4bbba79175c31f7cdcac464b4c1c':
  Don't try to launch broadcast receivers during boot
 2015-01-21 00:08:18 +00:00
Geoff Mendal
6bf768bf13 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp 2015-01-20 23:58:17 +00:00
Craig Mautner
b880c75eeb am f1eb1cdc: am d22c8d99: Merge "Revert "Remove debugging and skip InputMethod windows"" into lmp-mr1-dev 
* commit 'f1eb1cdc65376ea32ece4f7a4c750abe48c9f3c7':
  Revert "Remove debugging and skip InputMethod windows"
 2015-01-20 23:58:05 +00:00
Craig Mautner
07d2f0cff4 am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
* commit '1388342c7f6e9c235d31b01edf3716e83fad3e64':
  More debugging for bug 17721767
 2015-01-20 23:58:00 +00:00
Craig Mautner
d93597cee1 am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev 
automerge: 1388342

* commit '1388342c7f6e9c235d31b01edf3716e83fad3e64':
  More debugging for bug 17721767
 2015-01-20 23:56:48 +00:00
Christopher Tate
ebdec3e092 am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" into lmp-mr1-dev 
automerge: 8192670

* commit '8192670937e3dee8e2c521a9ed1118a5782a2912':
  Don't launch broadcast receiver processes during boot
 2015-01-20 23:55:00 +00:00
Sanket Padawe
63e77bf8a5 am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 automerge: 76e9d18 
* commit 'f0f5eee8238284aad08fd573959392542e57a8ab':
  Fixed a crash in TelephonyManager while calling getDeviceID()
 2015-01-20 23:54:52 +00:00
Jinsuk Kim
0ae35a8a26 am 00959a56: am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev automerge: 375ae7b 
* commit '00959a56e5869fcb8d05399656fddc9da54e86dc':
  Mark TimeUnit as @SystemApi
 2015-01-20 23:54:47 +00:00
Christopher Tate
fb4fde7053 Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6 
automerge: 78a05de

* commit '78a05de82daffdf746c252b49f12ef88073b0459':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:52:57 +00:00
Winson Chung
0a5be32d7a Merge "Cherry picking recents fixes to screen pinning and visibility." 2015-01-20 23:50:56 +00:00
Sanket Padawe
f0f5eee823 Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 
automerge: 76e9d18

* commit '76e9d18055d131bede49886c9c86c9f59db3fac4':
  Fixed a crash in TelephonyManager while calling getDeviceID()
 2015-01-20 23:49:54 +00:00
Jinsuk Kim
00959a56e5 am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev 
automerge: 375ae7b

* commit '375ae7ba3263ee8eceeb371b170e9181c801c612':
  Mark TimeUnit as @SystemApi
 2015-01-20 23:47:44 +00:00
Craig Mautner
db370e1cba am 6673d09a: Merge "Remove debugging and skip InputMethod windows" into lmp-mr1-dev automerge: d9a79b5 automerge: 03d7cc3 
* commit '6673d09a8a9bae0d5240d2fdd78b70b02e5af0a2':
  Remove debugging and skip InputMethod windows
 2015-01-20 23:24:43 +00:00
Craig Mautner
387f598ef9 resolved conflicts for merge of a3342991 to master 
Change-Id: I6a26297c6ea7c312d0d152243172fb5472444936
 2015-01-20 15:17:31 -08:00