Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
144,546 Commits 3 Branches 0 Tags
4f22c47d87fbf47326eef254b280efbdd40b2315
Commit Graph

41950 Commits

Author SHA1 Message Date
Wei Wang
4f22c47d87 am 03aeeb29: am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '03aeeb294657a616710aca3ff8e1ca5080a1b67b':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:50:00 +00:00
Jeff Davidson
44e2be10f6 am fb28414b: am d0868c89: Implement VpnService.setBlocking(). 
* commit 'fb28414b5a1d32e023c74c755fa0283290414606':
  Implement VpnService.setBlocking().
 2014-07-23 18:28:08 +00:00
Brian Attwell
85511418d4 am 1a038e57: am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact 
* commit '1a038e572ec718b2364650144dc6d6969a4a2410':
  Add PICK_JOIN_CONTACT_ACTION action contact
 2014-07-23 18:20:03 +00:00
Jeff Davidson
6bbf39cf6b Implement VpnService.setBlocking(). 
Bug: 12879610
Change-Id: I3a0ad9eae5f7dd9c01f75b9da71810bad38f9fec
 2014-07-23 11:18:57 -07:00
Brian Attwell
e98a95c156 Add PICK_JOIN_CONTACT_ACTION action contact 
This ContactsContract change is needed by ag/509090

Bug: 16190113
Change-Id: I0f96286bdf45015148d2e84f7fe7aac5b23e1ba2
 2014-07-23 18:11:13 +00:00
Dianne Hackborn
bfa2253e4b am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 
* commit '9566ecd9fbac848ba576282fd9ee315c33b28f0e':
  Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
 2014-07-23 17:12:01 +00:00
Sander Alewijnse
8e1a01a49c am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'ce1088a641b0027df04e3388a73423294262d547':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:11:57 +00:00
Jeff Davidson
b317bbbac0 am dfe72ae3: am 69c976c6: Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev 
* commit 'dfe72ae322567b6ac7be6644ea0811beec0a4d4b':
  Expose NETWORK_SCORE_SERVICE as @SystemApi.
 2014-07-23 16:55:20 +00:00
Jungshik Jang
01b9a90a80 am a6501c7a: am 0062e49d: Merge "Fix unknown tag @throw" into lmp-dev 
* commit 'a6501c7aeeeba1d93948d226c7b83d5f757e9297':
  Fix unknown tag @throw
 2014-07-23 14:38:55 +00:00
Chris Wren
941d57ad86 am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit '43387c0c2cfc0b319f3a6884e5008f1d18e0c8b2':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:28:54 +00:00
Chris Wren
1031c97485 Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Expose a new API for listeners to get the group key for the notificaiton.

Bug: 15190903
Change-Id: I324ba0c394affdabb3588ca2ebafa7cf0acad2af
 2014-07-23 09:45:25 -04:00
Chris Wren
9246171277 am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev 
* commit '1ef27c1c9e9fb035951ca88881399fa3f57564df':
  Revert "Honor the sort and group keys for notification ranking."
 2014-07-23 12:59:09 +00:00
Chris Wren
636f360ba5 am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking. 
* commit '14d65e68ad753c2384785061ea6e470a995dcab6':
  Honor the sort and group keys for notification ranking.
 2014-07-23 12:59:01 +00:00
Bryan Mawhinney
645a63bc4a am 64ccca0d: am d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
* commit '64ccca0d703bb176799216fa84e17bec352f02d3':
  Store actions passed to MediaStyle.setShowActionsInCompactView in extras
 2014-07-23 12:58:47 +00:00
Jungshik Jang
cfd1fa6357 am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService. 
* commit 'c1d403f661b6c7b9339e983e7f89a4c7e287e72b':
  Add startTimerRecording api to IHdmiControlService.
 2014-07-23 12:58:38 +00:00
Chris Wren
4a24fd3c7b Honor the sort and group keys for notification ranking. 
Sort notifications naturally, then move group childen to be next their proxy.
The group proxy is the summary, or if no summary exists, the lowest-ranked
member of the group is chosen as the proxy.

Notifications with a sortKey but no group and placed into a synthetic
group that consists of all notifications from that package and user in
the same priority bucket that also have sortKeys.

Bug: 15190903
Change-Id: I377ed65b9592079446da4a4189f5ab49d28630ec
 2014-07-23 10:36:57 +00:00
Bryan Mawhinney
e191f901d9 Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
So that they can be bridged appropriately by Android Wear

Change-Id: I3a21a74991c8067ece1a04fbd0b92dd21438e0fd
 2014-07-23 08:49:28 +00:00
Jungshik Jang
bffb0635aa Add startTimerRecording api to IHdmiControlService. 
In order to support timer recording we need separate API,
startTimerRecording. Also added HdmiTimerRecordingSources
which is used to help creating timer recording information
such as timing information and program information.

Besides, in order to distinguish one touch record
and timer recording, rename startRecord with startOneTouchRecording.

Bug: 16160962
Change-Id: I8c3d4034665a2f84ddf07135aee73e17ac17cd82
 2014-07-23 16:12:10 +09:00
Sander Alewijnse
0c1dcfd161 Merge "Add Device Policy API to disable screen capture." into lmp-dev 2014-07-23 05:48:23 +00:00
Sander Alewijnse
d2a1eec400 Add Device Policy API to disable screen capture. 
WindowManager will set secure flag on SurfaceControl for
all windows of a flagged user to prevent screen capture.
API is consistent with the camera disable API.

Change-Id: Ib180f67f1ad827b6f4aca2af615274256cce58f4
 2014-07-23 13:44:28 +00:00
Chris Wren
cf7ed58308 Revert "Honor the sort and group keys for notification ranking." 
This reverts commit df09d4c348f9f2aea10391b27d157d8b71a9e189.

Change-Id: Idbc9ed5c5c83cd0cad5a71872bcc203321a11e9e
 2014-07-23 12:41:37 +00:00
Narayan Kamath
0c434aed47 Merge "Add an internal API to get all asset locales." into lmp-dev 2014-07-23 05:48:23 +00:00
Narayan Kamath
37197df479 Add an internal API to get all asset locales. 
This will allow us to not copy paste this code verbatim into
bundled apps.

bug: 10090157

(cherry picked from commit 9e6d9d4c81)

Change-Id: I34690a2b6dad51f1592f37d3c2a8c81345632c2f
 2014-07-23 11:17:30 +01:00
Narayan Kamath
4c6ce23816 Remove copy of Locale.adjustLanguageCode. 
(cherry picked from commit 1d31a5f824)

Change-Id: I7b30a153a44dc1f99a9ddfe256b770d7305a74b7
 2014-07-23 11:09:26 +01:00
Narayan Kamath
c9e2716f7b Merge "Remove copy of Locale.adjustLanguageCode." into lmp-dev 2014-07-23 05:48:23 +00:00
Alan Viverette
f8ddc76c96 am a6f63294: am 560faa81: Merge "Remove dialog icons" into lmp-dev 
* commit 'a6f63294f897e56591c08bed17ff7f6138dd70c0':
  Remove dialog icons
 2014-07-23 01:53:14 +00:00
Jungshik Jang
a87c384f2b Merge "Fix unknown tag @throw" into lmp-dev 2014-07-23 01:10:40 +00:00
Jungshik Jang
a00161675f Fix unknown tag @throw 
Change-Id: I8c017a83175c447d02d8eb28f571e31921ae77c6
 2014-07-23 23:30:00 +09:00
Carlos Valdivia
1321d01b50 am 8725abad: am 26680d5c: Merge "Allow authenticators to rename accounts." into lmp-dev 
* commit '8725abadce9cda4894780eaa24781a1f878512d5':
  Allow authenticators to rename accounts.
 2014-07-23 00:45:49 +00:00
Chris Craik
35763b1c0b am 1f9b1c74: am d93bb9e1: Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev 
* commit '1f9b1c74aad278704920e8181c31229dd05bb49b':
  Make setter methods on Outline call setEmpty() based on params
 2014-07-23 00:37:07 +00:00
Sandeep Siddhartha
e40a8685ec am 7573ba5f: am 82d56d82: Merge "Make hotword availability a callback" into lmp-dev 
* commit '7573ba5f00c5c7470942bae5d5c8a0cecd002333':
  Make hotword availability a callback
 2014-07-23 00:37:03 +00:00
Alan Viverette
5b9b89180c am ee9da48f: am 22086055: Update spinner asset, fix default popup context and elevation 
* commit 'ee9da48f932b39d06294690098849305387c614d':
  Update spinner asset, fix default popup context and elevation
 2014-07-23 00:29:10 +00:00
Alan Viverette
77e5037d81 Update spinner asset, fix default popup context and elevation 
BUG: 15985882
Change-Id: Ica8c2597c35bd3012da11e315a93bbd1df2f3f38
 2014-07-23 00:18:07 +00:00
Chong Zhang
f4da6eaf1a am c32da708: am 2c4813d3: update battery stats for audio/video 
* commit 'c32da70878e8c5b4b8175157af9acee90e4656e0':
  update battery stats for audio/video
 2014-07-23 00:14:23 +00:00
Chong Zhang
f3d00e4e0a update battery stats for audio/video 
Bug: 12979595

Change-Id: I581376cb88a2d14dc4bad77d454b9bba73d0eb9b
 2014-07-23 00:01:46 +00:00
Sreeram Ramachandran
3e47b60378 am a4a22918: am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev 
* commit 'a4a229185c60f4abf6674adc6a49e5ab7000fb16':
  Cleanup: Delete dead code.
 2014-07-22 23:53:25 +00:00
Chris Craik
c403a39089 Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev 2014-07-22 22:02:55 +00:00
Chris Craik
0645128b80 Make setter methods on Outline call setEmpty() based on params 
bug:16142564

Additionally, better define behavior around null outline providers:

A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.

Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
 2014-07-22 15:15:11 -07:00
Alan Viverette
ed8e09b664 Remove dialog icons 
BUG: 16493564
Change-Id: Ica59abb70a924cccd705172d323a535ef9b75cf1
 2014-07-22 18:41:37 -07:00
Paul Soulos
bc642e88ae am 642251ef: am 9d129942: Adds ScrollBounds to the Transition framework 
* commit '642251ef91bf4d593d7ab657df03b00afb2973ac':
  Adds ScrollBounds to the Transition framework
 2014-07-22 21:47:25 +00:00
Alexandra Gherghina
a461c35ef5 am 6ec756fd: am 5f9a77e5: Do Not Merge Per-user API for master sync 
* commit '6ec756fd1503ea88bd1ca031eeef733e2a44bfac':
  Do Not Merge Per-user API for master sync
 2014-07-22 21:47:05 +00:00
Igor Murashkin
6f978b3e73 am f555fe55: am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev 
* commit 'f555fe554c28bc8f4e094dce502f343d70be4f3e':
  camera2: Add legacy available Request/Result/Characteristics keys
 2014-07-22 21:46:55 +00:00
Alan Viverette
7b689aa6cf am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev 
* commit '11dbd68d68aba1c7f42304544f88fbffe496bb02':
  Add popupTheme attr, propagate from ActionBar to ToolBar
 2014-07-22 21:46:49 +00:00
Alex Klyubin
7b969f3eea am 0caaa29e: am 09a76692: Align PSKKeyManager with framework API style. 
* commit '0caaa29e5bf388c929e81ed417637f4fe4df52f8':
  Align PSKKeyManager with framework API style.
 2014-07-22 21:46:43 +00:00
Paul Soulos
2dcab18c6c Adds ScrollBounds to the Transition framework 
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
 2014-07-22 14:17:48 -07:00
Sandeep Siddhartha
0edc8cea2b Merge "Make hotword availability a callback" into lmp-dev 2014-07-22 20:44:55 +00:00
Sandeep Siddhartha
f63bc523ea Make hotword availability a callback 
This helps us make the list sound models operation an async one, it also helps us
with the case where a detector is invalidated, so the client doesn't have to keep checking the
state.

Synchronize DatabaseHelper methods on its instance so that other VoiceInteractionManagerService
calls aren't blocked on db writes/reads.
It's still possible for the list operation to be blocked on update and vice-versa

Change-Id: Ib8ec4ac5056b62d443038560ce31d0641b4627b0
 2014-07-22 17:11:52 -07:00
Alexandra Gherghina
0e9ac20d7e Do Not Merge Per-user API for master sync 
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)
 2014-07-22 20:15:45 +00:00
Alex Klyubin
fcd8b20e09 Align PSKKeyManager with framework API style. 
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
  implementations for all methods.

Bug: 16403305
Bug: 15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
 2014-07-22 19:51:34 +00:00
Sreeram Ramachandran
e0d713afdc am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev 
* commit 'bae0d23df8e1461168e229e170247433a3a3ab38':
  Fix WiFi-Direct.
 2014-07-22 18:57:59 +00:00