Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,600 Commits 3 Branches 0 Tags
87cd0dc425201d56f1b07fa710d4f44fff4131bc
Commit Graph

36693 Commits

Author SHA1 Message Date
Tim Kilbourn
87cd0dc425 Add KEYCODE_PAIRING. 
Used for initiating a peripheral pairing mode.

Change-Id: I8e172bdda1f3c34eff36f3001c174f7a6b6e6e41
 2014-05-16 15:14:53 -07:00
John Reck
4b300d7dcb Merge "Add missing fence()" 2014-05-16 21:47:33 +00:00
John Reck
44ac42a6c9 Add missing fence() 
Bug: 14995924

Change-Id: I991fe74f01468b1b7e34aee0455dc419637f5c8d
 2014-05-16 14:46:07 -07:00
Matthew Williams
4b291fbffc Merge "TM TaskServiceContext implementation" 2014-05-16 20:48:46 +00:00
Alan Viverette
62cb534edb Merge "Update ripple behavior, use render thread animation" 2014-05-16 20:29:08 +00:00
Alan Viverette
ad2f8e334f Update ripple behavior, use render thread animation 
Change-Id: Ib6bc1e08b05d29606f452961963d58b8fc866746
 2014-05-16 13:28:33 -07:00
Dianne Hackborn
3fce73a866 Merge "Fix recording of wake_lock_in." 2014-05-16 19:42:54 +00:00
Amith Yamasani
891e65c5ce Merge "Variant of sendBroadcast with appOp flag for cross-user." 2014-05-16 19:40:20 +00:00
Amith Yamasani
3cf75729d5 Variant of sendBroadcast with appOp flag for cross-user. 
Needed for delivering SMS notifications to multiple users.

Change-Id: Ib772292699aba37144621742e6f0ee5c68aadd78
 2014-05-16 12:37:29 -07:00
Selim Gurun
4455f54b5b Merge "Add a setting for data reduction proxy key" 2014-05-16 19:09:10 +00:00
Selim Gurun
178201f7ff Add a setting for data reduction proxy key 
Bug: 12492817
Change-Id: I15c42d631f6ba9ab4dcce38e96f0486efaf3d22f
 2014-05-16 11:50:37 -07:00
Igor Murashkin
9d08a93b2d Merge "camera2: Move parameters around to different packages" 2014-05-16 18:08:41 +00:00
Dianne Hackborn
9a75543006 Fix recording of wake_lock_in. 
There was a bug that would allow the nesting count
to get off.  Also better documentation of times in
HistoryItem, and new option to disable resetting of
the stats when unplugging.

Change-Id: If1b39a02475c5b620c67b700a323a6d0462d5c61
 2014-05-16 10:46:33 -07:00
Griff Hazen
a13bfae217 am cfa27161: am 50c11659: Fix Notification sdk docs build. 
* commit 'cfa271618f5b33eae200c97c6c3624df9d04efc2':
  Fix Notification sdk docs build.
 2014-05-16 17:41:28 +00:00
John Reck
6d6ce03a03 resolved conflicts for merge of 313c5f38 to master 
Conflicts:
	core/java/android/view/HardwareRenderer.java

Change-Id: Ic5e4d578932fdcfe52d5f541bf1e1a93f33c32cd
 2014-05-16 10:38:14 -07:00
Matthew Williams
691e93e82c TM TaskServiceContext implementation 
Each task is run on the client from within a TaskServiceContext.
TSC tracks the state of execution of each task on the client.

Change-Id: I93c306a83c1115559f4e9675d9997dceae3f186a
 2014-05-16 10:33:48 -07:00
Jason Monk
8974f24909 Merge "Notify AppOpsService of UserRestrictions and Owners" 2014-05-16 17:30:31 +00:00
Griff Hazen
2c255a9505 Merge "resolved conflicts for merge of de35b636 to master" 2014-05-16 17:26:06 +00:00
Robert Greenwalt
fcfef283d8 Merge "Clean up when we switch networks." 2014-05-16 17:16:19 +00:00
Griff Hazen
c091ba8dd0 resolved conflicts for merge of de35b636 to master 
Conflicts:
	core/java/android/app/Notification.java

Change-Id: I39ace14c976431bd7f6f1f9d5e4174b0a100aab0
 2014-05-16 10:13:26 -07:00
Jason Monk
62062996dd Notify AppOpsService of UserRestrictions and Owners 
This makes the DevicePolicyManagerService and UserManagerService
push the DeviceOwner/ProfileOwners and user restrictions on boot
as well as on any change.

This also adds a list of restrictions that allow any op to connected with
a user restriction such that it will return MODE_IGNORED when the user
restriction is present (except for the device/profile owner).

Change-Id: Id8a9591d8f04fe5ecebd95750d9010afc0cd786c
 2014-05-16 13:12:41 -04:00
Griff Hazen
cfa271618f am 50c11659: Fix Notification sdk docs build. 
* commit '50c11659f0f971e1a6b0adde59247f5de370b74d':
  Fix Notification sdk docs build.
 2014-05-16 16:56:47 +00:00
Griff Hazen
50c11659f0 Fix Notification sdk docs build. 
Builder#X looked like it was considered ambiguous even though Action
was not in scope. Intellij disagreed but this fixes the issue.

Change-Id: I51fac39b2a4834e25f936c6eae223cda8c9c610e
 2014-05-16 09:46:31 -07:00
John Reck
313c5f38e8 am f18aed83: am 0661ddee: Merge "Enable display list updates with zero delta time" 
* commit 'f18aed83f63b41fc9e2fd4cecc1fdf2c08c302c0':
  Enable display list updates with zero delta time
 2014-05-16 16:00:09 +00:00
John Reck
f18aed83f6 am 0661ddee: Merge "Enable display list updates with zero delta time" 
* commit '0661ddee112477db180d65e605f34fd538fdf8bc':
  Enable display list updates with zero delta time
 2014-05-16 15:56:07 +00:00
Robert Greenwalt
4064af844c Clean up when we switch networks. 
Need to unhitch mNetworkForRequestId when a network is no longer
satisfying a request.

Change-Id: I3b3cde7dd92ec87a76ae7a0825ad22e892fa8fd5
 2014-05-16 08:54:07 -07:00
John Reck
0661ddee11 Merge "Enable display list updates with zero delta time" 2014-05-16 15:51:39 +00:00
Griff Hazen
de35b636df am 959591e3: Add support for extendable actions to Notification. 
* commit '959591e3ba3934f5bd8ecc2c81ad2a16d226acab':
  Add support for extendable actions to Notification.
 2014-05-16 15:40:18 +00:00
Chris Wren
c5a88944f0 Merge "Extend NotificationListenerService to support system use cases." 2014-05-16 15:31:23 +00:00
Chris Wren
1941fc7186 Extend NotificationListenerService to support system use cases. 
Bug: 14846846
Change-Id: Ic308b2f78c86393304d446c57fd677294e01717c
 2014-05-16 11:23:50 -04:00
Dan Sandler
4ec3b0f9ab Merge "Badge largeIcons with the notification icon." 2014-05-16 15:18:40 +00:00
Adrian Roos
3242f51c93 Merge "Apply revised TrustAgent API" 2014-05-16 14:32:07 +00:00
Dan Sandler
190d58d621 Badge largeIcons with the notification icon. 
The old right-hand small icon is no more; instead the
notification's small icon is overlaid atop the largeIcon
bitmap.

If the small icon would have had a colored circle background
applied to it in the large left-hand slot, it gets a similar
treatment when used as a badge.

Change-Id: I8b262afbdd4faab2beffd294d662f4759f35f3b3
 2014-05-16 10:07:54 -04:00
Adrian Roos
7e03dfcb79 Apply revised TrustAgent API 
Bug: 14997466
Change-Id: I81042e058a20f28603a11471882f3dcfc4f8b13c
 2014-05-16 16:06:28 +02:00
Narayan Kamath
3bd2c6ffea am b4606676: am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow." 
* commit 'b4606676a8e357f7b6de049099a04438f7c1b4eb':
  Init the static member when first used for CursorWindow.
 2014-05-16 12:34:48 +00:00
Narayan Kamath
b4606676a8 am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow." 
* commit '49538def98520eb57d4fb634bf09b2f3104e7953':
  Init the static member when first used for CursorWindow.
 2014-05-16 12:29:59 +00:00
Narayan Kamath
49538def98 am 79e0206e: Merge "Init the static member when first used for CursorWindow." 
* commit '79e0206ef3203a1842949242e58fa8f3c25eb129':
  Init the static member when first used for CursorWindow.
 2014-05-16 12:26:34 +00:00
Narayan Kamath
79e0206ef3 Merge "Init the static member when first used for CursorWindow." 2014-05-16 12:24:33 +00:00
Jungshik Jang
b0650e8ff3 Merge "Add ARC commands" 2014-05-16 06:49:18 +00:00
Griff Hazen
959591e3ba Add support for extendable actions to Notification. 
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
 2014-05-15 22:26:18 -07:00
Todd Poynor
540f4d6db3 BatteryManager: Add property ENERGY_COUNTER and long data type properties 
Change-Id: Ie7f9b19c5cd47a48bb33af03d51acddaa14b0243
 2014-05-16 03:04:33 +00:00
Sungsoo Lim
07d5e7d5fa Merge "Implements TtmlRenderer." 2014-05-16 01:56:17 +00:00
Jerome Poichet
8d56ff8b70 Merge "Adding Activity Action entry" 2014-05-16 01:38:33 +00:00
Chris Craik
c9ee304c91 Merge "Round rect outline clipping" 2014-05-16 00:37:29 +00:00
Selim Gurun
9f29702361 Merge "Webview Cleanup part 2" 2014-05-16 00:20:48 +00:00
Chris Craik
deeda3d337 Round rect outline clipping 
Change-Id: Iee9cf4f719f6f1917507b69189ad114fa365917b
 2014-05-15 16:36:12 -07:00
Robert Greenwalt
389f5b81a0 Merge "Remove unneed clear in constructor." 2014-05-15 23:32:51 +00:00
Selim Gurun
6e1e0e2ec4 Webview Cleanup part 2 
Bug: 1231013

Move classes only needed by Browser to browser package.

Change-Id: I7c8080a74a15c06040e0ac0d4b713afbfd02e2e0
 2014-05-15 16:05:40 -07:00
Alan Viverette
1d90d3e4bf Deprecate FragmentBreadCrumbs, remove styles add in L 
Adds comments to the private styles so that we don't try to
update them again in the future.

BUG: 14997266
Change-Id: I0099063d1ce254682aff6bcdd051ebf8719d562b
 2014-05-15 16:04:05 -07:00
Alan Viverette
1a0c96696e Merge "Ensure volume preference has correct defStyleAttr" 2014-05-15 22:13:36 +00:00