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
Junda Liu
2eb5a5f727 Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev 2014-11-12 00:05:20 +00:00
Bryce Lee
68f97736e6 Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev 2014-11-11 23:59:34 +00:00
Andreas Gampe
db38706603 Merge "Frameworks/base: Fix FingerprintManager JNI" 2014-11-11 23:47:53 +00:00
Andreas Gampe
316e75fee6 Merge "Frameworks/base: Wall Werror in rs" 2014-11-11 23:47:25 +00:00
Amith Yamasani
52c39a16db Allow profile owners to set the unknown source setting 
This allows work profile MDM to enable unknown sources
even if the user doesn't have UI for it. Installing an
app from an unknown source will still prompt the user
with the package installer dialog, so it's not like the
MDM can now quietly install apps from non-market sources.

Bug: 18316350

Change-Id: Ia8f4fe36f12a258aa888e085acc0b358925f4817
 2014-11-11 23:38:24 +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
Adam Lesinski
5930c5cafd am da772234: Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev automerge: 1e2e05b 
automerge: be6c125

* commit 'be6c125783686be593e958725249ffcff5717fc4':
  AAPT: Ignore densities specified in -c flag
 2014-11-11 22:36:46 +00:00
Chris Wren
8d7858f416 am aeca1baf: Merge "Add event logs when we launch fullscreen notications." into lmp-mr1-dev automerge: 56c1037 
automerge: 3aa1998

* commit '3aa19984adc6f3e26e4b8551ab663de8b23afc29':
  Add event logs when we launch fullscreen notications.
 2014-11-11 22:35:30 +00:00
Prabhakar Thirumoorthy
9161b1acb5 am 2cc8043c: Merge "If task isn\'t found in recents, look in the stacks." into lmp-mr1-dev automerge: d476bfd 
automerge: f82ab73

* commit 'f82ab735a7d353bb400f0e6343f7553a8afa4887':
  If task isn't found in recents, look in the stacks.
 2014-11-11 22:33:38 +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
Rich Slogar
8f524103d8 docs: workflow index 
Change-Id: I4b3004696698c4f15109373eda684fe0143dd7d6
 2014-11-11 14:19:47 -08: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
Rich Slogar
d1e0ca12f5 docs:revision updates 
Change-Id: I292fedcbbc81f5b742a1ecd2c1f55ae15d583c30
 2014-11-11 13:51:07 -08:00
Jinsuk Kim
7fa3a66470 CEC: Buffer messages coming from unknown device 
Introduced a buffer for messages to be kept for later processing
when they arrive before the service is ready to handle them.
<Active Source>/<Initiate ARC> are handled in this CL to address
the reported bug.

Bug: 18277839

Change-Id: I1e73dd83dc9dd4a822fbcf4fda4c6221f09631cb
 2014-11-12 06:21:27 +09: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
Rich Slogar
b858db5ba7 docs: tools help update 
Change-Id: Ida8d313e0439c64fd3f272513d053f44701e22be
 2014-11-11 12:37:07 -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
George Mount
264d3a21a0 Update GhostView properly when underlying view changes. 
Bug 18308803

Change-Id: Iad1366ea8fe3ba488dfb82ff1f9e170cafb4b2ec
 2014-11-11 12:15:01 -08: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
5097b28975 am d660e05c: am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt" 
* commit 'd660e05c84c7412336ca5510ff9514357e9ba074':
  Fixing NULL pointer access causing segmentation fault in aapt
 2014-11-11 19:57:25 +00:00
Adam Lesinski
4a4a2a6766 am 044f323e: am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI" 
* commit '044f323e624084de464e780828f1d7f204e4d01d':
  Frameworks/base: Fix AssetManager JNI
 2014-11-11 19:57:20 +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
Wink Saville
a374c3d03b Update SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
 2014-11-11 11:48:04 -08: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
bc0636e560 am 7b1c33f7: am 00795e9e: Merge "return error MEDIA_ERROR_UNSUPPORTED when Range request fail" into lmp-mr1-dev automerge: 6610985 
* commit '7b1c33f7a498b954d4c098e9f1a367b2be395d83':
  return error MEDIA_ERROR_UNSUPPORTED when Range request fail
 2014-11-11 18:55:35 +00:00
Pavel Zhamaitsiak
ac5aedb018 am aa3c3e86: am 7635aab1: Merge "IMS: Peer capabilities support" into lmp-mr1-dev automerge: 5ff25cb 
* commit 'aa3c3e864e58a0802fb988619816ec6a37191b71':
  IMS: Peer capabilities support
 2014-11-11 18:55:30 +00: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
Wale Ogunwale
3dc4000a82 am b53960d5: am 285970cf: Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev automerge: 4937d95 
* commit 'b53960d5b41bc4cd0f5e0bd054e6f13e42bbafd5':
  Fixed index out of bounds issue when removing windows.
 2014-11-11 18:40:06 +00:00
Alan Viverette
3b54b6d78c am cf7f3b6b: am a9b503ae: Merge "Fix Material styling in remaining dialogs and layouts" into lmp-mr1-dev automerge: 0aaebd4 
* commit 'cf7f3b6be252f313536e58cc62763075d4f45e5a':
  Fix Material styling in remaining dialogs and layouts
 2014-11-11 18:39:44 +00:00
Deepanshu Gupta
83e5329b3b am 028372b0: am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev automerge: 8f6e7a8 
* commit '028372b070d3d293ac6b1b42681339bee7848407':
  Don't skip loading object animator.
 2014-11-11 18:39:39 +00:00
John Spurlock
f4a53c6d59 am 6044b5f3: am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev automerge: 3069aa2 
* commit '6044b5f39420a214258948198997a1b17458dd49':
  Zen: Exit downtime on next alarm (if mode=none).
 2014-11-11 18:39:34 +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
Selim Cinek
a37774f098 Fixed a bug where the clearable flag was set inconsistently 
This could lead to undismissable notifications.

Bug: 17758698
Change-Id: I60ccbe24686c5b8bc46bfb52e590cef71ed7a190
 2014-11-11 19:16:18 +01: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