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

172736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
d112e1e3b1 Import translations. DO NOT MERGE 
Change-Id: Id43fa0b68b9dc1b43bed35a16e587a4d6b3a9a2f
Auto-generated-cl: translation import
 2014-11-10 09:22:08 -08:00
Jungshik Jang
11eb372a90 am 7403d656: am 324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev 
automerge: a981a71

* commit 'a981a715c429bcdfe648e05d6de088ad5aa31419':
  CEC: Send <Give System Audio Mode> regardless of TV's setting.
 2014-11-10 01:25:52 +00:00
Jungshik Jang
a981a715c4 am 7403d656: am 324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev 
* commit '7403d656470dd7b4875e006410e257795a09d183':
  CEC: Send <Give System Audio Mode> regardless of TV's setting.
 2014-11-10 01:10:31 +00:00
Jungshik Jang
7403d65647 am 324b1f8a: Merge "CEC: Send <Give System Audio Mode> regardless of TV\'s setting." into lmp-mr1-dev 
* commit '324b1f8a4729b226c9f282eb870359dd02847441':
  CEC: Send <Give System Audio Mode> regardless of TV's setting.
 2014-11-10 00:58:55 +00:00
Jungshik Jang
324b1f8a47 Merge "CEC: Send <Give System Audio Mode> regardless of TV's setting." into lmp-mr1-dev 2014-11-10 00:54:33 +00:00
Adam Powell
c6ff9ab808 am 3e03e8b2: am 61effdd2: am e5a6f821: Merge "Don\'t register more receivers and observers for every DateTimeView" into lmp-mr1-dev 
* commit '3e03e8b20b4c49658921e10c974015e24408e81c':
  Don't register more receivers and observers for every DateTimeView
 2014-11-09 19:31:26 +00:00
Adam Powell
3e03e8b20b am 61effdd2: am e5a6f821: Merge "Don\'t register more receivers and observers for every DateTimeView" into lmp-mr1-dev 
* commit '61effdd2c2c945504fd788ee0dce5ccc5d57e66b':
  Don't register more receivers and observers for every DateTimeView
 2014-11-09 19:27:31 +00:00
Adam Powell
61effdd2c2 am e5a6f821: Merge "Don\'t register more receivers and observers for every DateTimeView" into lmp-mr1-dev 
* commit 'e5a6f821399bf354520f08f77819af4a846ae5f1':
  Don't register more receivers and observers for every DateTimeView
 2014-11-09 19:23:04 +00:00
Adam Powell
e5a6f82139 Merge "Don't register more receivers and observers for every DateTimeView" into lmp-mr1-dev 2014-11-09 19:18:54 +00:00
Andreas Gampe
373cab3ad3 am 6973e2c2: Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE automerge: 88d12e5 -s ours automerge: aed8e76 -s ours 
automerge: d944b94  -s ours

* commit 'd944b9477aa94595ec7b23ab30bce05b1828ebb4':
  Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
 2014-11-09 17:55:59 +00:00
Andreas Gampe
d944b9477a am 6973e2c2: Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE automerge: 88d12e5 -s ours automerge: aed8e76 -s ours 
* commit '6973e2c26f1ecd96e17a6211ae99d85582894678':
  Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
 2014-11-09 17:44:56 +00:00
Andreas Gampe
6973e2c26f Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE automerge: 88d12e5 -s ours 
automerge: aed8e76  -s ours

* commit 'aed8e76172477c884ec7bef659f050d0817efb7d':
  Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
 2014-11-09 16:49:47 +00:00
Andreas Gampe
aed8e76172 Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE 
automerge: 88d12e5  -s ours

* commit '88d12e5f7bdd85323aacacffb6950a336132df67':
  Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE
 2014-11-09 16:28:10 +00:00
Andreas Gampe
88d12e5f7b Frameworks/base: Clockwork preloaded-classes list DO NOT MERGE 
Tighter list derived from usage.

Bug: 18248625
Change-Id: I3796fc13f880b1219579103c81bc2d1d727eb4df
 2014-11-09 16:08:15 +00:00
Andreas Gampe
c6dcf1fd67 am 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings" 
* commit '5bbb52e8a4242efeea27921ac3e38cf6f9c56162':
  Frameworks/base: Fix more warnings
 2014-11-09 00:52:52 +00:00
Andreas Gampe
5bbb52e8a4 am 189bf056: Merge "Frameworks/base: Fix more warnings" 
* commit '189bf05616b854f0319c7329a96e63ad374fd6c0':
  Frameworks/base: Fix more warnings
 2014-11-09 00:48:11 +00:00
Andreas Gampe
189bf05616 Merge "Frameworks/base: Fix more warnings" 2014-11-09 00:37:42 +00:00
Jim Miller
88e2c6149f am c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge: 5292069 
automerge: 481fc74

* commit '481fc7427b419efb98428f27c5b0e252183ff315':
  Change Configure structure to List<PersistableBundle>
 2014-11-08 13:56:45 +00:00
Jim Miller
481fc7427b am c6a04240: Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev automerge: 5292069 
* commit 'c6a042401a740b360790f71884b66fd3a2a09447':
  Change Configure structure to List<PersistableBundle>
 2014-11-08 13:45:08 +00:00
Andreas Gampe
25df5fba3a Frameworks/base: Fix more warnings 
Exposed by switching the target to Clang, and GCC 4.9 used by
MIPS.

Change-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947
 2014-11-07 22:24:57 -08:00
Jim Miller
c6a042401a Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev 
automerge: 5292069

* commit '529206907f178d394cf1643d39f86c9dbc40e310':
  Change Configure structure to List<PersistableBundle>
 2014-11-08 03:36:38 +00:00
Mike Lockwood
7c2b60ed37 am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5 
automerge: 5a880e72

* commit '5a880e72024882d1a4ad5a04a4cb4a6aa5e6d426':
  Add dumpsys support for bluetooth
 2014-11-08 03:09:13 +00:00
Adam Lesinski
a4d5542ae4 am b94de814: Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev automerge: 96f635e 
automerge: 4f163bd

* commit '4f163bd8acc1b00394c1fae7c2ffc42fc5ca2790':
  UsageStatsService: Update file index to prevent double checkin
 2014-11-08 03:07:57 +00:00
Jeff Sharkey
d9ae1c8167 am 6e2e4b73: Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev automerge: 9a2db6b 
automerge: 58159b3

* commit '58159b320c9523bae10721236cf7245d88942131':
  Resurrect dusty PackageManagerTests.
 2014-11-08 03:06:56 +00:00
Amith Yamasani
78673cc6aa am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519 
automerge: 2a21f24

* commit '2a21f247885780d90873bb25aa7c7f710e4bffcc':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 03:05:45 +00:00
Mike Lockwood
5a880e7202 am d73463c6: Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev automerge: 95c05a5 
* commit 'd73463c61a9ada1083155214be15ba3c653b73f5':
  Add dumpsys support for bluetooth
 2014-11-08 03:00:35 +00:00
Adam Lesinski
4f163bd8ac am b94de814: Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev automerge: 96f635e 
* commit 'b94de814479749818e30dace03c70697485c7809':
  UsageStatsService: Update file index to prevent double checkin
 2014-11-08 03:00:29 +00:00
Jeff Sharkey
58159b320c am 6e2e4b73: Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev automerge: 9a2db6b 
* commit '6e2e4b7343eeae8ac8439bcf6bf3678609b4a230':
  Resurrect dusty PackageManagerTests.
 2014-11-08 03:00:02 +00:00
Amith Yamasani
2a21f24788 am 1aeab291: Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev automerge: 395b519 
* commit '1aeab291764b77ffa2c6e6eb28441beec6fa041c':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 02:59:55 +00:00
Jim Miller
529206907f Merge "Change Configure structure to List<PersistableBundle>" into lmp-mr1-dev 2014-11-08 02:37:17 +00:00
Mike Lockwood
d73463c61a Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev 
automerge: 95c05a5

* commit '95c05a590f97d81a5d4e5d86540833cc1637ffdc':
  Add dumpsys support for bluetooth
 2014-11-08 02:31:31 +00:00
Adam Lesinski
b94de81447 Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev 
automerge: 96f635e

* commit '96f635ed5b30507b2a6d72c2547d4784fe53ac3d':
  UsageStatsService: Update file index to prevent double checkin
 2014-11-08 02:30:31 +00:00
Jeff Sharkey
6e2e4b7343 Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev 
automerge: 9a2db6b

* commit '9a2db6bfb9cb24d3b5b02fe3dc43a7e9699a40bf':
  Resurrect dusty PackageManagerTests.
 2014-11-08 02:29:18 +00:00
Amith Yamasani
1aeab29176 Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev 
automerge: 395b519

* commit '395b519f4bfec6e1c171aaca2c62a75a5c07de07':
  Inform PendingIntent sender if broadcast was not queued.
 2014-11-08 02:28:24 +00:00
Andreas Gampe
47119ad669 am 1897a8e2: am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage" 
* commit '1897a8e2fbf94169061e568683fbeda0c3bae0b6':
  Frameworks/base: Wall Werror in libs/storage
 2014-11-08 02:15:46 +00:00
Mike Lockwood
95c05a590f Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev 2014-11-08 02:15:28 +00:00
Andreas Gampe
1897a8e2fb am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage" 
* commit '9ade8c1ad59a40f1a2fdbe88074d05aa97a95aff':
  Frameworks/base: Wall Werror in libs/storage
 2014-11-08 02:11:03 +00:00
Andreas Gampe
3c3bd8a410 am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds" 
automerge: 5bf0c65

* commit '5bf0c65eef972e743ca02e93f8d5ad7df5097931':
  Frameworks/base: Fix two warnings in cmds
 2014-11-08 02:09:06 +00:00
Adam Lesinski
96f635ed5b Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev 2014-11-08 02:07:45 +00:00
Andreas Gampe
5bf0c65eef am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds" 
* commit 'f89a2fdacb2ba907f180188dc79f9de81e3eb254':
  Frameworks/base: Fix two warnings in cmds
 2014-11-08 02:04:43 +00:00
Jeff Sharkey
9a2db6bfb9 Merge "Resurrect dusty PackageManagerTests." into lmp-mr1-dev 2014-11-08 01:57:02 +00:00
Amith Yamasani
395b519f4b Merge "Inform PendingIntent sender if broadcast was not queued." into lmp-mr1-dev 2014-11-08 01:39:12 +00:00
Adam Lesinski
0fb25fae8f UsageStatsService: Update file index to prevent double checkin 
We seem to have renamed a file as checked-in twice, which means
we checked it in twice and created a malformed name with the suffix
"-c-c" instead of the correct suffix "-c".

Bug:18280677
Change-Id: Ie3164010898a333e5d9b97151d285ea376de799e
 2014-11-07 17:36:27 -08:00
Jim Miller
0814d41c73 Change Configure structure to List<PersistableBundle> 
Adding the new structure was making it difficult for
LMP devices to have common source with upcoming API version.

Fixes bug 17008504

Change-Id: I704503cf0ebff113874c87ab11e37735dbe7b8d7
 2014-11-07 17:18:37 -08:00
Andreas Gampe
9ade8c1ad5 Merge "Frameworks/base: Wall Werror in libs/storage" 2014-11-08 01:14:59 +00:00
Andreas Gampe
f89a2fdacb Merge "Frameworks/base: Fix two warnings in cmds" 2014-11-08 01:10:50 +00:00
Andreas Gampe
ebee1379ea Frameworks/base: Fix two warnings in cmds 
Change-Id: Ifb9c7fb7a2d28c13010ddc186bea5f5f0daefb4a
 2014-11-08 01:04:45 +00:00
Stuart Scott
870338c946 am bc1d9755: am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev 
* commit 'bc1d97556d32a45ceca5db3e2af12cd3d4cf5590':
  SubInfoRecord provides a tinted icon with the initial embossed.
 2014-11-08 00:25:14 +00:00
Jeff Sharkey
2a53332343 Resurrect dusty PackageManagerTests. 
Mostly just getting them running again, still a few failures related
to native library symlinks that need more investigation.

Bug: 18048725
Change-Id: I4642adab9fb2b9ec1488b700edcee48c09e36005
 2014-11-07 16:24:51 -08:00
Stuart Scott
bc1d97556d am 0e58219f: am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev 
* commit '0e58219f7fbb3f39af109e0fa6c7ed8c47ee9f3b':
  SubInfoRecord provides a tinted icon with the initial embossed.
 2014-11-08 00:21:06 +00:00