Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
179,850 Commits 3 Branches 0 Tags
44f397efcf398a99bcdffd484605e83ea0cd90e9
Commit Graph

44994 Commits

Author SHA1 Message Date
Olawale Ogunwale
be37df395e am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
automerge: 0f8ecc8

* commit '0f8ecc84c8b86054bfd3275f942c3a705df01fbb':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-13 20:19:57 +00:00
Olawale Ogunwale
0f8ecc84c8 am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
* commit '9d293911221cac930eb8edfef01362ea083eeaab':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-12 16:44:28 +00:00
Olawale Ogunwale
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +00:00
Paul McLean
96798efe99 Merge "Support for simultaneous USB Audio Devices connect/disconnect" 2015-01-09 23:12:37 +00:00
Paul McLean
0a8f06922f Support for simultaneous USB Audio Devices connect/disconnect 
Attach/Detach logic
Decoupling card# and list index
Modern loop constructs
Consistent logging flags
Add class/type flags to device "address" string.
Factored UsbAudioDevice out of UsbAudioManager.

Bug: 18399845
Bug: 18717784

Change-Id: I6f185e1c24091d4c0d21eb7e922a1496748d32c3
 2015-01-09 14:56:43 -08:00
Jeff Sharkey
df38a17020 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev automerge: 0cb736f 
automerge: d6a8c32

* commit 'd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd':
  Guard against MountService throwing NPE.
 2015-01-09 19:29:24 +00:00
Jeff Sharkey
d6a8c32a6a am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 
automerge: 0cb736f

* commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1':
  Guard against MountService throwing NPE.
 2015-01-09 19:24:31 +00:00
Jeff Sharkey
0cb736f754 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 
* commit '2b46774ff950270365238e12e4a336e2004500e2':
  Guard against MountService throwing NPE.
 2015-01-09 19:21:24 +00:00
Jeff Sharkey
2b46774ff9 Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 2015-01-09 19:14:29 +00:00
Chet Haase
5058c38a31 Add backgroundColor getter to View 
Change-Id: I3a75169a2e91ec712fb1db4d130089a1261fc66b
 2015-01-09 10:00:22 -08:00
Brian Attwell
cc4b2f731e Ubundle from contacts contract Part 1/3 
1. Remove Intents.UI
2. Expose Authority
3. Expose ProviderStatus

Discussion: go/contacts-contact-intent-ui

Bug: 18777272
Change-Id: I9c6125cc30710e4637b38f3785608abb9928d1a2
 2015-01-09 01:07:45 +00:00
Mathieu Chartier
c2c2e26fd4 Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e automerge: 117ba18 
automerge: eb896e1

* commit 'eb896e1febd57eba541b8760bcd7010457598b85':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:40:23 +00:00
Mathieu Chartier
eb896e1feb Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e 
automerge: 117ba18

* commit '117ba186d1d28ae7eb6d1187c795e502668fa9b4':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:28:33 +00:00
Mathieu Chartier
9a6c45eedd Merge "Call VMRuntime.clampGrowthLimit for small heap apps" 2015-01-09 00:17:16 +00:00
Alan Viverette
4e5168fae4 Update year picker to use activation colors 
Change-Id: I148b592538e1e4a928bd7ebb99a3083b760b839d
 2015-01-08 15:25:30 -08:00
Mathieu Chartier
24cee07160 Call VMRuntime.clampGrowthLimit for small heap apps 
If the manifest doesn't specify large heaps, we now call
VMRuntime.clampGrowthLimit to release heap virtual address space
which won't ever get used.

Bug: 18387825
Bug: 17131630
Change-Id: I61fdcd70c70234256637eeebefe3abb22b91095d
 2015-01-08 14:42:20 -08:00
Jeff Sharkey
9708669b2f Guard against MountService throwing NPE. 
Fall through to below logic and return null instead of crashing the
entire app.  We already tell developers the value may be null.

Bug: 17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
 2015-01-08 14:00:15 -08:00
Dianne Hackborn
adf1c93ff7 am 3968820f: am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev automerge: 16e4324 
* commit '3968820fc75e1eac03e54cba45b5a0adc28ee87d':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:55:28 +00:00
Dianne Hackborn
3968820fc7 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 
automerge: 16e4324

* commit '16e4324dd967d180f77fb25dbeea77229eaf0511':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:48:34 +00:00
Dianne Hackborn
16e4324dd9 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 
* commit 'cb8d8e10b0c1163914aca85f8e3b73a0cac86fb4':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:46:53 +00:00
Alan Viverette
5dc973cb03 Use text ascent / descent to center SimpleMonthView labels 
Also updates Canvas.drawText() docs to clarify that the y-origin is
actually the baseline rather than the top (which is what developers
expect).

BUG: 18864682
Change-Id: Ibfa2a79327d17b5135f90468195fbeca922a25c8
 2015-01-08 11:12:39 -08:00
Dianne Hackborn
29cd7f1962 Fix issue #18827122: system server crashed on broadcasting... 
...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
 2015-01-08 10:58:45 -08:00
Marcin Kosiba
3e853fb1d2 Un-break the WebView build. 
This renames methods that have been renamed in
Ib9d403156c1fc4fb04f65f3c126d1277a44b3740 back to their original
names.

Change-Id: I07b2fb94b21c42c36958855d19d996f96b0ce5c4
 2015-01-08 12:45:40 +00:00
Jeff Sharkey
6fe380724b am bcba2182: Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 automerge: 387da77 
* commit 'bcba21827c836e8941719b432fbf11d1bb8e8639':
  check ntpserver as empty string instead of null
 2015-01-08 01:11:05 +00:00
Jeff Sharkey
bcba21827c Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 
automerge: 387da77

* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
  check ntpserver as empty string instead of null
 2015-01-08 01:03:49 +00:00
Jeff Sharkey
dbcb4a16d4 Merge "check ntpserver as empty string instead of null" 2015-01-08 00:57:43 +00:00
Alan Viverette
4456b81f22 Merge "Add popup window accessors for anchor overlap, gravity, window" 2015-01-08 00:37:17 +00:00
Young-Ho Cha
0eda7dfcac check ntpserver as empty string instead of null 
mServer cannot set null, because string from resource always returns
non-null charsequence

Change-Id: I8d6a6fdbc34267ee361e7bd20719887268161870
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
 2015-01-08 09:34:01 +09:00
Alan Viverette
b97d69856d API for tinting TextView compound drawables 
BUG: 18762354
Change-Id: Iba6fab4f63a5d26cb27606d25a1fd0a1f47afa57
 2015-01-07 16:16:20 -08:00
Alan Viverette
2d4c476aca Merge "Fix accessibility delegation" 2015-01-08 00:07:25 +00:00
Alan Viverette
a54956a0bc Fix accessibility delegation 
Ensures that delegate code is run last. Previously, calling the super
method from an accessibility delegate set on a widget would only run
code in the widget's parent. Next, the delegate code would run. Finally,
the widget's code would run. As a result, the widget code would override
any data supplied by the delegate.

By moving all overridden code to internal methods, we ensure that the
call chain for super includes the widget's parent code followed by the
widget's code. The delegate code will always run last.

BUG: 17641433
Change-Id: Ib9d403156c1fc4fb04f65f3c126d1277a44b3740
 2015-01-07 16:05:02 -08:00
Alan Viverette
75d837954c Add popup window accessors for anchor overlap, gravity, window 
Cleans up comments and some code in PopupWindow.

BUG: 18245054
Change-Id: I2111d0c194ee1a39aaa721083041fc139efcf630
 2015-01-07 15:51:54 -08:00
Christopher Tate
81a2b3f82a am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
automerge: e045188

* commit 'e04518866e0c75e6c96976aca77f24dc22b51416':
  Support single-package backup rejection by the transport
 2015-01-07 23:32:28 +00:00
Christopher Tate
e04518866e am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
* commit '413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca':
  Support single-package backup rejection by the transport
 2015-01-07 23:30:34 +00:00
Alan Viverette
ed26b9cfe8 Merge "Fix date picker color handling, expose StateSet utils in more places" 2015-01-07 23:26:19 +00:00
Christopher Tate
413ec4a657 am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 
* commit 'bee49807dde9f19d5163e87b71fe17392bfe857c':
  Support single-package backup rejection by the transport
 2015-01-07 23:23:14 +00:00
Christopher Tate
bee49807dd Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev 2015-01-07 23:19:50 +00:00
Alan Viverette
c5b95c20b6 Fix date picker color handling, expose StateSet utils in more places 
Enabled use of color selectors for the day number text, which lets us
use the "activated" text color and push the selection background
opacity up to 100%. Also ensures the selector circle stays within the
bounds of the selected day.

BUG: 18864682
Change-Id: Ia36ea748f83e13683a1de8ac1a259d353578d61a
 2015-01-07 13:57:12 -08:00
Narayan Kamath
fa8d52fef4 am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase" 
automerge: 6ed2140

* commit '6ed21403e7dea44a70ae06da64229a557ee19c98':
  camera2: Clarify the documentation on the ImageReader usecase
 2015-01-07 18:44:33 +00:00
Narayan Kamath
6ed21403e7 am e02fe5af: am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase" 
* commit 'e02fe5afac0bc792559a4c424ffc8391c501abfe':
  camera2: Clarify the documentation on the ImageReader usecase
 2015-01-07 18:42:57 +00:00
Martin Storsjo
5c533e4fa0 camera2: Clarify the documentation on the ImageReader usecase 
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.

Change-Id: I75261baf162a58c415705db99afa474c3826f900
 2015-01-07 20:10:25 +02:00
Ben Murdoch
bc20686f92 am 6a3e7015: am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit '6a3e70159cbbd3c4b7df89165c280ea4f7d56fa5':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 16:06:33 +00:00
Ben Murdoch
6a3e70159c am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit 'd4bc95770ddfcb8be63fa768ac9eaf27512f8107':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 16:01:27 +00:00
Ben Murdoch
d4bc95770d am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev 
* commit '1eee52b1aa0ba0cc05ac513d0fa91de9ee643faf':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
 2015-01-07 15:55:12 +00:00
Ben Murdoch
574fa34dd5 Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation. 
Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
 2015-01-07 15:13:48 +00:00
Amith Yamasani
5c72de4cee am 442dcb17: am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch" 
* commit '442dcb1761f5f200c12c3f86409f780fbcf20e51':
  NPE in SearchManager.triggerSearch
 2015-01-07 00:58:04 +00:00
Yin-Chia Yeh
cabe15ac76 am 641178f9: am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 
* commit '641178f94fa5561cb5fe2f893f689b7cd568eaa1':
  Camera: doc update for color aberration modes
 2015-01-07 00:57:59 +00:00
Deepanshu Gupta
b95475404e resolved conflicts for merge of 20db8770 to master 
Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc
 2015-01-06 16:41:58 -08:00
Amith Yamasani
442dcb1761 am 21735e22: am dcf323ad: Merge "NPE in SearchManager.triggerSearch" 
* commit '21735e222e0009b1ddcb080faa5b51117d0da879':
  NPE in SearchManager.triggerSearch
 2015-01-07 00:17:09 +00:00
Yin-Chia Yeh
641178f94f am c2112a75: am 8d46f934: Merge "Camera: doc update for color aberration modes" into lmp-mr1-dev 
* commit 'c2112a75983cce62ed493ec0feafbb2c27ad76b4':
  Camera: doc update for color aberration modes
 2015-01-07 00:10:51 +00:00