Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,184 Commits 3 Branches 0 Tags
a709ee572174db647bf0af2a71a364bab2823583
Commit Graph

38423 Commits

Author SHA1 Message Date
Christoph Studer
a709ee5721 am d67d073b: Merge "Rename basePkg to opPkg" 
* commit 'd67d073b9fd110e6b9dfa6af11e8655dcc69f6ef':
  Rename basePkg to opPkg
 2014-04-16 17:45:21 +00:00
Christoph Studer
8fd7f1ed7c Rename basePkg to opPkg 
...and actually populate the field correctly.

Change-Id: I3ce52efedb919d6af75dc9c3532e47764c467cac
 2014-04-16 18:51:25 +02:00
Christoph Studer
a67e648f3e am 97096fd0: Merge "Write eventlog entries for notification visibility" 
* commit '97096fd0e64d5cdce3e24139ed6b13cc76c5047e':
  Write eventlog entries for notification visibility
 2014-04-16 15:54:18 +00:00
Christoph Studer
92b389da2a Write eventlog entries for notification visibility 
Keep track of notifications shown in the notification panel
and log them via eventlog.

Added the following eventlog tag:
  * notification_visibility_changed

Bug: 13442201
Change-Id: Ifb74ec2492967dc787b4de86db7d7f00be6c7f74
 2014-04-16 17:07:49 +02:00
Ben Murdoch
1b0f04fb06 am 6f51cd7e: Merge "Revert "Revert "Define new general permission APIs for webview.""" 
* commit '6f51cd7ede3abd1bc076a4aa24f6fd78ac3ad0fc':
  Revert "Revert "Define new general permission APIs for webview.""
 2014-04-16 12:49:17 +00:00
Ben Murdoch
6f51cd7ede Merge "Revert "Revert "Define new general permission APIs for webview.""" 2014-04-16 12:45:24 +00:00
Christopher Tate
30812df59c am 9187e40b: Merge "Don\'t crash if a null key is passed for verification/parsing" 
* commit '9187e40b16b60b7d4ea62b0607b16089161cad09':
  Don't crash if a null key is passed for verification/parsing
 2014-04-16 00:06:31 +00:00
Christopher Tate
9187e40b16 Merge "Don't crash if a null key is passed for verification/parsing" 2014-04-15 23:59:46 +00:00
Todd Poynor
91c8c96734 am fb5c8bab: Merge "Context: fixup wrong Javadoc link for BatteryManager" 
* commit 'fb5c8baba52c041951f6a35545402b14e5bb3e56':
  Context: fixup wrong Javadoc link for BatteryManager
 2014-04-15 23:37:25 +00:00
Todd Poynor
fb5c8baba5 Merge "Context: fixup wrong Javadoc link for BatteryManager" 2014-04-15 23:33:42 +00:00
Jim Miller
d56f885a25 am 4c4fc3e1: Merge "Default to PASSWORD_QUALITY_UNSPECIFIED" 
* commit '4c4fc3e172f7ba1a3d3c04145472d2b6607e0608':
  Default to PASSWORD_QUALITY_UNSPECIFIED
 2014-04-15 23:19:21 +00:00
Jim Miller
4c4fc3e172 Merge "Default to PASSWORD_QUALITY_UNSPECIFIED" 2014-04-15 23:13:24 +00:00
Todd Poynor
99f7e125b0 Context: fixup wrong Javadoc link for BatteryManager 
Change-Id: I3dec0a359185fd9bfc78d98f8232ff64e6a784dd
 2014-04-15 16:05:49 -07:00
Alan Viverette
f8612cd206 am a17bfe04: Merge "Allow clamped bound position to be INVALID_POSITION" 
* commit 'a17bfe04a777f68d41d17f62e83d52aca4df48cc':
  Allow clamped bound position to be INVALID_POSITION
 2014-04-15 22:19:16 +00:00
Todd Poynor
e56d4275ac am 7a8e3fcd: Merge "BatteryManager: Add API and service for battery property retrieval" 
* commit '7a8e3fcd3c33d56e0010ad0da52bc1aae6c065b8':
  BatteryManager: Add API and service for battery property retrieval
 2014-04-15 22:19:11 +00:00
Alan Viverette
a17bfe04a7 Merge "Allow clamped bound position to be INVALID_POSITION" 2014-04-15 22:17:28 +00:00
Alan Viverette
875f4c2918 Allow clamped bound position to be INVALID_POSITION 
Change-Id: Idd392e41cb8df31e2933851fa6abd87fc3e2001b
 2014-04-15 15:16:48 -07:00
Todd Poynor
7a8e3fcd3c Merge "BatteryManager: Add API and service for battery property retrieval" 2014-04-15 22:16:13 +00:00
Youngsang Cho
33a4799598 am 7ec8b21a: Merge "Remove TvInputSession" 
* commit '7ec8b21a06364357976b6b60a12a49b255ac39eb':
  Remove TvInputSession
 2014-04-15 21:37:14 +00:00
Youngsang Cho
7ec8b21a06 Merge "Remove TvInputSession" 2014-04-15 21:32:16 +00:00
Youngsang Cho
674e96216d Remove TvInputSession 
TvInputSession is not used anymore. Instead, TvInputManager.Session
and TvInputService.TvInputSessionImpl are used.

Change-Id: Id252afa76b4ef45f561b1d20095ee235a9fdccf8
 2014-04-15 14:25:36 -07:00
Todd Poynor
e35872da97 BatteryManager: Add API and service for battery property retrieval 
Add service "batterymanager" and method getProperty to retrieve
battery properties.  This is a public API.

Make BatteryProperty public.  Cleanups for public-facing API.

Change-Id: I3637d131aabe4811dff40661728d5353eaf854c4
 2014-04-15 13:54:08 -07:00
Christopher Tate
3014733c8c Don't crash if a null key is passed for verification/parsing 
Change-Id: I77c496d9d86d2831a4166a924afe1493aa0ac0ce
 2014-04-15 12:57:47 -07:00
Tao Bai
4c22b54776 Revert "Revert "Define new general permission APIs for webview."" 
This reverts commit e0a7b08d36.

Change-Id: Ieba5a72524e43eb5e2fccb39647fd11e9d9494c8
 2014-04-15 18:04:49 +00:00
Tao Bai
844b25a527 am 31e052bf: Merge "Revert "Define new general permission APIs for webview."" 
* commit '31e052bfc4c81f0aa682d723a88cd9b716b6cace':
  Revert "Define new general permission APIs for webview."
 2014-04-15 18:04:21 +00:00
Tao Bai
31e052bfc4 Merge "Revert "Define new general permission APIs for webview."" 2014-04-15 18:01:43 +00:00
Tao Bai
e0a7b08d36 Revert "Define new general permission APIs for webview." 
This reverts commit 672b99c8f8.

Change-Id: I486b313b8cd638d5e29e2f022bba99b570a9415f
 2014-04-15 17:58:02 +00:00
Tao Bai
f53f2d27ac am e5b7c95b: Merge "Define new general permission APIs for webview." 
* commit 'e5b7c95b8a247e9962710dca127c56a78d4faca5':
  Define new general permission APIs for webview.
 2014-04-15 17:40:33 +00:00
Tao Bai
e5b7c95b8a Merge "Define new general permission APIs for webview." 2014-04-15 17:37:12 +00:00
Jim Miller
431207343f Default to PASSWORD_QUALITY_UNSPECIFIED 
This changes methods in LockPatternUtils to default to PASSWORD_QUALITY_UNSPECIFIED
instead of PASSWORD_QUALITY_SOMETHING.  This was confusing device encryption tools on a
freshly installed device that has never had a PIN, pattern or password set up.

Change-Id: If9b62a71220ed7520b6730201e55e34e89c0357d
 2014-04-14 23:57:08 +00:00
Deepanshu Gupta
2f202be72e am 8d95b500: Merge "Action bar rendering in layoutlib" 
* commit '8d95b5009ce5592f55a9487536fa640724dc316b':
  Action bar rendering in layoutlib
 2014-04-14 23:12:03 +00:00
Deepanshu Gupta
8d95b5009c Merge "Action bar rendering in layoutlib" 2014-04-14 23:07:30 +00:00
Christopher Lane
68fe45839a am 111db01a: resolved conflicts for merge of 381ac080 to master 
* commit '111db01a2668b7a1ec256a4166c322db061d1ddd':
  Add support for custom TXT records in NSD
 2014-04-14 22:20:52 +00:00
Christopher Lane
111db01a26 resolved conflicts for merge of 381ac080 to master 
Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21
 2014-04-14 15:14:01 -07:00
Jae Seo
225ef788e3 am 72139a92: Merge "Add a contract class for the TV content provider" 
* commit '72139a92ab7b4e7f986f57a3ac4134fd6c404968':
  Add a contract class for the TV content provider
 2014-04-14 21:35:40 +00:00
Jae Seo
72139a92ab Merge "Add a contract class for the TV content provider" 2014-04-14 21:31:16 +00:00
Christopher Lane
381ac08054 am 62538940: Merge "Add support for custom TXT records in NSD" into klp-modular-dev 
* commit '62538940de1755c71c56b0e5d81e12397e5de58a':
  Add support for custom TXT records in NSD
 2014-04-14 21:16:27 +00:00
Christopher Lane
62538940de Merge "Add support for custom TXT records in NSD" into klp-modular-dev 2014-04-14 21:13:09 +00:00
Christopher Lane
b72d8b4091 Add support for custom TXT records in NSD 
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
 2014-04-14 14:10:36 -07:00
Alan Viverette
5539d1737c am 58c1c293: Merge "Actually store gravity in ActionBar.LayoutParams constructor" 
* commit '58c1c2938517a8a9fe685f7c138749aca8cd0c9b':
  Actually store gravity in ActionBar.LayoutParams constructor
 2014-04-14 20:07:08 +00:00
Alan Viverette
58c1c29385 Merge "Actually store gravity in ActionBar.LayoutParams constructor" 2014-04-14 20:03:35 +00:00
Alan Viverette
da4bd6fd96 Actually store gravity in ActionBar.LayoutParams constructor 
Change-Id: I19252d55188e0ef075a272985f468fbe3c0628f5
 2014-04-14 12:59:15 -07:00
John Reck
673da9ae9a am 1562f2e5: Merge "Fence on destruction" 
* commit '1562f2e574a423ea8e000b84432d4cae2a848cc3':
  Fence on destruction
 2014-04-14 19:53:42 +00:00
John Reck
1562f2e574 Merge "Fence on destruction" 2014-04-14 19:48:18 +00:00
John Reck
fae904d639 Fence on destruction 
Bug: 14052927
 destroyCanvasAndSurface() needs a fence as when it returns the
 underlying BufferQueue is going to be released from under
 the render thread.

Change-Id: I0147a1d5ec5adf0239c761ef22f65cd8c8a137df
 2014-04-14 12:44:53 -07:00
Raph Levien
13301ef47d am 7bc016e8: am f6ee7e3f: am 202d1ec7: Fix text shadow attributes in textAppearance 
* commit '7bc016e88a854d8de870ddb6e235fab3c902c0c7':
  Fix text shadow attributes in textAppearance
 2014-04-14 19:37:23 +00:00
Raph Levien
7bc016e88a am f6ee7e3f: am 202d1ec7: Fix text shadow attributes in textAppearance 
* commit 'f6ee7e3f47ee443078d803b03c0507ea1bf5cd54':
  Fix text shadow attributes in textAppearance
 2014-04-14 19:32:52 +00:00
Raph Levien
f6ee7e3f47 am 202d1ec7: Fix text shadow attributes in textAppearance 
* commit '202d1ec753ff9401f3a1ea93a09a7419e76b7f91':
  Fix text shadow attributes in textAppearance
 2014-04-14 19:30:22 +00:00
Fabrice Di Meglio
e3cd5f03af am 1c3f4092: Merge "SearchIndexablesProvider - support for querying for non indexable data keys" 
* commit '1c3f409284b47312c1c7e5d36283df9a05d29dfb':
  SearchIndexablesProvider - support for querying for non indexable data keys
 2014-04-14 19:14:13 +00:00
Evan Charlton
8c6d9e544e resolved conflicts for merge of 352e1082 to master-nova 
Change-Id: I6ab96bcc801d8c264908c89d465a9a7f49e1ef16
 2014-04-14 11:53:39 -07:00