Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
167,693 Commits 3 Branches 0 Tags
e323ff0653b07bca0c665be8f3fc5415e27bd2c7
Commit Graph

167693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ihab Awad
e323ff0653 am cf9248cb: am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
* commit 'cf9248cbf5461c8bf2fbae544c96bd0b5e7b5e02':
  Update PhoneAccount icon API (1/6)
 2014-11-12 00:28:26 +00:00
Jeff Brown
a473878158 am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
automerge: c1275e7

* commit 'c1275e72eceb171544aaf517f0cb6e3d1cbd9e08':
  Move device admin max screen off timeout to internal interface.
 2014-11-12 00:24:43 +00:00
Ihab Awad
cf9248cbf5 am 9114a845: Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 
* commit '9114a845d9474bc2ecc807c3f195fe0c5314556c':
  Update PhoneAccount icon API (1/6)
 2014-11-11 23:02:22 +00:00
Ihab Awad
9114a845d9 Merge "Update PhoneAccount icon API (1/6)" into lmp-mr1-dev 2014-11-11 22:56:08 +00:00
Jeff Brown
c1275e72ec am 32f7a6d8: Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 
* commit '32f7a6d813d7f936c7aa6a1f3abe2f05022a6cd9':
  Move device admin max screen off timeout to internal interface.
 2014-11-11 22:48:23 +00:00
Jeff Brown
32f7a6d813 Merge "Move device admin max screen off timeout to internal interface." into lmp-mr1-dev 2014-11-11 22:27:45 +00:00
Adam Lesinski
be6c125783 am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 
automerge: 1e2e05b

* commit '1e2e05bf8cb1445f9e431ca54837bb01f762d9e6':
  AAPT: Ignore densities specified in -c flag
 2014-11-11 22:15:44 +00:00
Chris Wren
3aa19984ad am aeca1baf: Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 
automerge: 56c1037

* commit '56c1037767fd77116c8de4021a56d761c6bd288c':
  Add event logs when we launch fullscreen notications.
 2014-11-11 22:14:44 +00:00
Prabhakar Thirumoorthy
f82ab735a7 am 2cc8043c: Merge "If task isn\'t found in recents, look in the stacks." into lmp-mr1-dev 
automerge: d476bfd

* commit 'd476bfd01b7443d63381141d14a20833421d8657':
  If task isn't found in recents, look in the stacks.
 2014-11-11 22:11:23 +00:00
Ihab Awad
476cc83558 Update PhoneAccount icon API (1/6) 
Responding to comments by jeffbrown@ in http://ag/574833

Bug: 18291787

Change-Id: I011aa59642f1ca6998bce76a59850909d2daa987
 2014-11-11 13:18:49 -08:00
Adam Lesinski
1e2e05bf8c am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 
* commit 'da772234f6f9498bf02f31448bda16e9fcbd6bd2':
  AAPT: Ignore densities specified in -c flag
 2014-11-11 20:26:24 +00:00
Chris Wren
56c1037767 am aeca1baf: Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 
* commit 'aeca1baf656ac5197db345db6b890a5c5e4719b0':
  Add event logs when we launch fullscreen notications.
 2014-11-11 20:26:19 +00:00
Adam Lesinski
da772234f6 Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev 2014-11-11 20:23:59 +00:00
Chris Wren
aeca1baf65 Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev 2014-11-11 20:21:59 +00:00
Prabhakar Thirumoorthy
d476bfd01b am 2cc8043c: Merge "If task isn\'t found in recents, look in the stacks." into lmp-mr1-dev 
* commit '2cc8043cad4c51aeffd5650b669b15e93fb980d5':
  If task isn't found in recents, look in the stacks.
 2014-11-11 20:05:20 +00:00
Prabhakar Thirumoorthy
2cc8043cad Merge "If task isn't found in recents, look in the stacks." into lmp-mr1-dev 2014-11-11 20:01:10 +00:00
Adam Lesinski
d660e05c84 am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt" 
* commit '8aa93764ea025b1c20f96b366ae6efb17e4f2d67':
  Fixing NULL pointer access causing segmentation fault in aapt
 2014-11-11 19:53:52 +00:00
Adam Lesinski
044f323e62 am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI" 
* commit '24c16b7e4cdbacedd33347a01ff4944abfc86218':
  Frameworks/base: Fix AssetManager JNI
 2014-11-11 19:53:44 +00:00
Adam Lesinski
8aa93764ea Merge "Fixing NULL pointer access causing segmentation fault in aapt" 2014-11-11 19:36:20 +00:00
Adam Lesinski
24c16b7e4c Merge "Frameworks/base: Fix AssetManager JNI" 2014-11-11 19:35:28 +00:00
Craig Mautner
e042bf2b22 If task isn't found in recents, look in the stacks. 
It may take an attach to move a task into the recents list. If the
timing is right a task may not be in recents by the time we are
removing it from the stacks due to a finish. In that case we should
look in the stacks for the task as well as looking in recents.

Fixes bug 18017409.

Change-Id: Idcfe2e263c9d0fe9a063fdf22515ac4e7fe89ecb
 2014-11-11 11:28:43 -08:00
Chong Zhang
7b1c33f7a4 am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 
automerge: 6610985

* commit '6610985c35683fbc2bd827df97bdd185fe67248b':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
 2014-11-11 18:52:23 +00:00
Pavel Zhamaitsiak
aa3c3e864e am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev 
automerge: 5ff25cb

* commit '5ff25cb76cad3406e365d4cfe86b3820245e9d46':
  IMS: Peer capabilities support
 2014-11-11 18:50:21 +00:00
Chong Zhang
6610985c35 am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 
* commit '00795e9edda7038022d8f1268ca3304165076d2e':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
 2014-11-11 18:38:04 +00:00
Chong Zhang
00795e9edd Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev 2014-11-11 18:33:21 +00:00
Wale Ogunwale
b53960d5b4 am 285970cf: Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 
automerge: 4937d95

* commit '4937d95aa4f6eecec288f1b4f2d4cfd7f4b48044':
  Fixed index out of bounds issue when removing windows.
 2014-11-11 18:19:52 +00:00
Alan Viverette
cf7f3b6be2 am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
automerge: 0aaebd4

* commit '0aaebd47cc94461aa2c0c87405f2a8ba809ef6c1':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 18:18:07 +00:00
Deepanshu Gupta
028372b070 am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
automerge: 8f6e7a8

* commit '8f6e7a868ce7715184a0d9239c6a72d269083c38':
  Don't skip loading object animator.
 2014-11-11 18:16:28 +00:00
John Spurlock
6044b5f394 am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 
automerge: 3069aa2

* commit '3069aa2057826f5806e68544a3554fdc8d8d28c3':
  Zen: Exit downtime on next alarm (if mode=none).
 2014-11-11 18:14:58 +00:00
Pavel Zhamaitsiak
5ff25cb76c am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev 
* commit '7635aab10b44773d599ef8229a967fdf99d2817a':
  IMS: Peer capabilities support
 2014-11-11 18:11:45 +00:00
Chris Wren
223c66b681 Add event logs when we launch fullscreen notications. 
When the heads up does not trigger on enqueue, and also when a heads up
is escalated to a fullscreen on a screen event.

Bug: 16644299
Change-Id: Iec7f7ddb966b46171d0e7d1ee52daf5847a7c9da
 2014-11-11 18:11:25 +00:00
Pavel Zhamaitsiak
7635aab10b Merge "IMS: Peer capabilities support" into lmp-mr1-dev 2014-11-11 18:07:06 +00:00
Wale Ogunwale
4937d95aa4 am 285970cf: Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 
* commit '285970cfeae3b175699b038f51c0f9b012a95d0e':
  Fixed index out of bounds issue when removing windows.
 2014-11-11 18:03:04 +00:00
Wale Ogunwale
285970cfea Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev 2014-11-11 18:00:06 +00:00
Alan Viverette
0aaebd47cc am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 
* commit 'a9b503aec2cd27eeb40fab8436c64b4c7de9cacf':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 17:39:55 +00:00
Alan Viverette
a9b503aec2 Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev 2014-11-11 17:34:36 +00:00
Deepanshu Gupta
8f6e7a868c am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '7ed525bf92749113a177815ffce5d6545bd59314':
  Don't skip loading object animator.
 2014-11-11 17:26:17 +00:00
Deepanshu Gupta
7ed525bf92 am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit '5ad9b395db341b3360d481039f152f8ce1d8360c':
  Don't skip loading object animator.
 2014-11-11 17:22:00 +00:00
Deepanshu Gupta
5ad9b395db am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev 
* commit 'a44fdb9e216810ba62f20c1b4571ebc240931efa':
  Don't skip loading object animator.
 2014-11-11 17:17:02 +00:00
Deepanshu Gupta
a44fdb9e21 Merge "Don't skip loading object animator." into lmp-dev 2014-11-11 17:11:24 +00:00
John Spurlock
3069aa2057 am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 
* commit '73546e535925e6c2902cba10d9da962ba6b39d5f':
  Zen: Exit downtime on next alarm (if mode=none).
 2014-11-11 16:56:37 +00:00
John Spurlock
73546e5359 Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev 2014-11-11 16:50:15 +00:00
Shriram Ganesh
482e6da972 IMS: Peer capabilities support 
Add support for querying peer capabilities

IMS: Add support for HD icon display related information

Added support to pass the restrict cause associated with the peer
in order to enable display of the HD icon when necessary.Added
support to pass local audio codec information and defined values
for new codecs not defined.

Change-Id: If05d46bdb3907a0ec7efdde48337a7932a7a5c21
 2014-11-11 16:36:15 +00:00
George Mount
341df46488 am c07b6295: am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit 'c07b6295c6fefe845ae15e2adad7aebb2280b1ab':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:48:52 +00:00
George Mount
c07b6295c6 am 12403b24: Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 
* commit '12403b242f86c0572a99a963fd1e71eda680192b':
  Make setOutlineProvider change transitionGroup.
 2014-11-11 15:45:09 +00:00
George Mount
12403b242f Merge "Make setOutlineProvider change transitionGroup." into lmp-mr1-dev 2014-11-11 15:41:33 +00:00
Deepanshu Gupta
2c5cddbd07 Don't skip loading object animator. 
This is used by Buttons as part of StateListAnimator.

Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
 2014-11-11 15:21:19 +00:00
John Spurlock
3c984d67eb Zen: Exit downtime on next alarm (if mode=none). 
Bug: 16373455
Change-Id: Ie5d878ea4f930556ed84225c21d7c6df61024fbc
 2014-11-11 10:03:24 -05:00
Andreas Gampe
328126190b Frameworks/base: Fix AssetManager JNI 
Register the right method.

Change-Id: Ib5f5c531b4c5863eed04fe3b13f8c2662055fa5e
 2014-11-11 00:16:00 -08:00
Tim Kilbourn
06acead5a2 am 215779b2: am 54a5ca1a: Merge "Add tv product variants to strings." into lmp-mr1-dev 
* commit '215779b2262a6fd0ebeb93a369ad148223984f30':
  Add tv product variants to strings.
 2014-11-11 06:42:51 +00:00