Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simranjit Singh Kohli
8778f993ae [RemoveAccount API]: Adding support for intent. 
Adding support for intent handling provided by authenticators.

Bug: 18292092

Change-Id: I1e94422bc28e5fd54c454ee6542ff2d30f82849f
 2014-11-07 18:37:30 -08: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
Ricardo Cervera
650a908967 docs: Material design shadow fixes. 
Bug: 18294964

Change-Id: I7abb298c3de71b8d8905cbe476c40223234f2c2f
 2014-11-07 16:36:52 -08: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
Stuart Scott
0e58219f7f am 90cf41c3: Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev 
* commit '90cf41c35f5a4c82cd1e992498bcd9b30ad92446':
  SubInfoRecord provides a tinted icon with the initial embossed.
 2014-11-08 00:15:51 +00:00
Stuart Scott
90cf41c35f Merge "SubInfoRecord provides a tinted icon with the initial embossed." into lmp-mr1-dev 2014-11-08 00:09:16 +00:00
Scott Rowe
3632637b4a docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 
Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
 2014-11-07 16:05:13 -08:00
Stuart Scott
ab45ec177a SubInfoRecord provides a tinted icon with the initial embossed. 
bug: 17575308
Change-Id: I895975dfe8d1c4db8381ef9322bd72c8fcb3e22c
 2014-11-07 23:53:39 +00:00
Alan Viverette
73c3068b0e Call OnTimeChangedListener when new TimePicker values are selected 
BUG: 18295303
Change-Id: Ib5922db3a16c1975554072e2af241bbd6cf807c4
 2014-11-07 15:39:24 -08:00
Amith Yamasani
83b6ef01a0 Inform PendingIntent sender if broadcast was not queued. 
If the broadcast could not be queued due to a stopped user, the
party trying to send a PendingIntent should be notified right away.
Otherwise, for instance, AlarmManager could be waiting forever to
be called back after the broadcast is delivered.

This is a potential fix for:
Bug: 18290018

Change-Id: I07c0751e80f11e69dfa2be5c96a033aecb298b81
 2014-11-07 15:34:04 -08:00
Alan Viverette
cc3c573334 Reduce number of saveLayer calls in RippleDrawable 
Removes an extra saveLayer call by rendering ripples as overlapping. We
are now down to zero saveLayers when drawing unmasked ripples or ripples
masked against opaque content/masks, one saveLayer for ripples masked
against content and two saveLayers when masked against an explicit mask
layer.

BUG: 18226391
Change-Id: I0fc09d21fbc462fbcfe4c26fc7b18737f584043e
 2014-11-07 15:31:16 -08:00
Andreas Gampe
1c0668a3f8 am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 
* commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55':
  Frameworks/base: Wall Werror in libs/androidfw
 2014-11-07 23:17:40 +00:00
Jeff Sharkey
560893ce53 am 284ab646: am f13fe148: am 001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 
* commit '284ab646d879dcca4bcc287b26e8c50abc56666d':
  ProcessCpuTracker touching proc is fine.
 2014-11-07 23:17:36 +00:00
Andreas Gampe
83892ecb5c Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-11-07 23:15:30 +00:00
Andreas Gampe
dc9c109af8 resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp 
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
 2014-11-07 15:14:02 -08:00
Jeff Sharkey
284ab646d8 am f13fe148: am 001b2e93: Merge "ProcessCpuTracker touching proc is fine." into lmp-mr1-dev 
* commit 'f13fe14853ca13830e2bf293f3a24a965570b507':
  ProcessCpuTracker touching proc is fine.
 2014-11-07 23:13:41 +00:00
Christopher Tate
be98cdce1c am b63fd56b: am e5205d1a: am 48a7c3b5: Merge "Enable runtime turndown of backup/restore services" into lmp-mr1-dev 
* commit 'b63fd56b396dab177959ee33fe41ff40ff5c3c7f':
  Enable runtime turndown of backup/restore services
 2014-11-07 23:13:29 +00:00