Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
145,426 Commits 3 Branches 0 Tags
d213923d48a404e949e9527a98113fa78d010cf3
Commit Graph

38879 Commits

Author SHA1 Message Date
Justin Morey
254644779c Expose setActiveProfileOwner() using @SystemApi 
Change-Id: I1607fa90e76da495ede48f01ad250baae60108af
 2014-07-24 09:17:28 -05:00
ztenghui
397f6ee931 am 6ff3dce5: am b3067e74: am 69e50375: Add negative sign separation support in the pathData 
* commit '6ff3dce5a65494a4ae98949a0d9452045f8af9d6':
  Add negative sign separation support in the pathData
 2014-07-23 22:00:12 +00:00
Alan Viverette
f6a5fd39a0 am 8ec7d394: am 014089cd: am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev 
* commit '8ec7d394252ee801ded0bde940c8f7358cbc9099':
  Use activity for brightness dialog
 2014-07-23 22:00:07 +00:00
ztenghui
b3d6bd21c8 am b3067e74: am 69e50375: Add negative sign separation support in the pathData 
* commit 'b3067e74831c423ac66a19d268831def94f8e6c3':
  Add negative sign separation support in the pathData
 2014-07-23 21:55:56 +00:00
Alan Viverette
815382c8b6 am 014089cd: am 82b83fb5: Merge "Use activity for brightness dialog" into lmp-dev 
* commit '014089cd92401236b160c0f3384b430c1f610e34':
  Use activity for brightness dialog
 2014-07-23 21:55:50 +00:00
ztenghui
5a836f74df Add negative sign separation support in the pathData 
bug:14585171

Change-Id: I61dec27856be09c44bb1d32ff61b3c3cd458cc34
 2014-07-23 21:46:16 +00:00
Jae Seo
8c4ea37021 am 40a7428f: am 3555e7c6: am e51d3b9d: Fix build 
* commit '40a7428f2e2bded8623fb58409ae430fc8f80a3d':
  Fix build
 2014-07-23 20:31:53 +00:00
Jae Seo
9754a3a510 am 3555e7c6: am e51d3b9d: Fix build 
* commit '3555e7c6693a170a2fb8c432c0b00b1f537074b1':
  Fix build
 2014-07-23 20:28:01 +00:00
Jae Seo
80bc75a71e Fix build 
Change-Id: Icc1bf76ef748b10cc7ea745bc37c4e7bc0d7ff43
 2014-07-23 13:16:46 -07:00
Tao Bai
d673c47491 am f56d307b: am d5874836: am 9ba09c25: Merge "WebView permission change" into lmp-dev 
* commit 'f56d307b4b082c15a17898bf00fc2ee60a100386':
  WebView permission change
 2014-07-23 19:32:00 +00:00
Tao Bai
deee14685d am d5874836: am 9ba09c25: Merge "WebView permission change" into lmp-dev 
* commit 'd5874836d84053a2f887470200901008f6797735':
  WebView permission change
 2014-07-23 19:28:00 +00:00
Eino-Ville Talvala
3eaf05593b am fc4bbebd: am 6cfa6b5b: am e2894174: Camera2: Fix callback operation 
* commit 'fc4bbebdc5e35c1f5c932e1b6d9b266f68d6ce28':
  Camera2: Fix callback operation
 2014-07-23 19:28:00 +00:00
Eino-Ville Talvala
9630b94a69 am 6cfa6b5b: am e2894174: Camera2: Fix callback operation 
* commit '6cfa6b5b1ca3ecab93337835792f2afb71613d5a':
  Camera2: Fix callback operation
 2014-07-23 19:23:47 +00:00
Eino-Ville Talvala
2f75e7d7ef Camera2: Fix callback operation 
- Remove CloseableLock use; looks to be incompatible with invocations during callbacks
- Replace with basic interface lock to be thread-safe
- Add intermediate callback thread to legacy mode to match cross-process one-way Binder
  semantics

Change-Id: Iecd4ff6cf260c5a13bd11b850177ccea93e25933
 2014-07-23 19:14:10 +00:00
Prerepa Viswanadham
6ef301dbc5 am e2983f8c: am bdbd1b3b: am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
* commit 'e2983f8c83b0ce2f067322b07cf10c735cb044e8':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
 2014-07-23 19:12:23 +00:00
Ye Wen
ec0fe24937 am 1a9a6cef: am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit '1a9a6cefcb5f79a3421eac3a62d212c34ca2e75d':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 19:12:19 +00:00
Prerepa Viswanadham
eaae99f288 am bdbd1b3b: am 244c2f47: Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
* commit 'bdbd1b3b6ba06e2c52ce375e4221df4853e88319':
  Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting
 2014-07-23 19:05:44 +00:00
Ye Wen
bb1c3eeafe am dbbd116c: am a7d1baac: Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 
* commit 'dbbd116c9d1e67b67213e2be14f0198cf6e1b524':
  Infer legacy network type for ConnectivityManager.requestNetwork
 2014-07-23 19:05:41 +00:00
Tao Bai
67ac461a0a Merge "WebView permission change" into lmp-dev 2014-07-23 18:56:15 +00:00
Tao Bai
2871febb19 WebView permission change 
As requested by API council, the following were changed
- Changed the PermissionRequest to abstract.
- Used String for resources instead of long.
- Also remove the WebView.preauthorizePermission() which we didn't think

BUG: 15432556
Change-Id: I900a98b4e0288d2bcd8faf0bbcd84970600548a5
 2014-07-23 12:16:55 -07:00
Prerepa Viswanadham
8caac741a0 Bug 15564216: Report Bluetooth tx/rx/idle activity info and energy reporting 
Change-Id: I66fd83d8d59fbd93dec8886dfd313a81575e38a5
 2014-07-23 18:54:46 +00:00
Alan Viverette
f84bc66b21 Merge "Use activity for brightness dialog" into lmp-dev 2014-07-23 18:50:38 +00:00
Wei Wang
11dfc508d7 am 386deb92: am 03aeeb29: am 6d630c75: Merge "Fix parcel issues with empty service uuid. Added tests." into lmp-dev 
* commit '386deb926ca8309d1486b8b61f825710be9cbcef':
  Fix parcel issues with empty service uuid. Added tests.
 2014-07-23 18:54:04 +00:00
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
ba3f4c3bed am c8c398e1: am fb28414b: am d0868c89: Implement VpnService.setBlocking(). 
* commit 'c8c398e192a565811e7e1e4a0e3d54aa0fe7c852':
  Implement VpnService.setBlocking().
 2014-07-23 18:31:36 +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
4f3afa6039 am 16846152: am 1a038e57: am 41b62ac7: Add PICK_JOIN_CONTACT_ACTION action contact 
* commit '16846152b19b9487cf3403b3d3b7e4d4af6e6f46':
  Add PICK_JOIN_CONTACT_ACTION action contact
 2014-07-23 18:23:47 +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
Ye Wen
e5ebd4bc76 Merge "Infer legacy network type for ConnectivityManager.requestNetwork" into lmp-dev 2014-07-23 17:52:05 +00:00
Ye Wen
b87875eb88 Infer legacy network type for ConnectivityManager.requestNetwork 
ConnectivityManager.requestNetwork pass TYPE_NONE to
sendRequestForNetwork which prevents it from being used with legacy API
requestRouteToHostAddress. This CL infers the legacy network type
automatically from the network capabilities.

b/16324360

Change-Id: I591d38f875f42f56e8cfc157db2069c9eee0ee26
 2014-07-23 11:41:17 -07:00
Dianne Hackborn
cb2303e365 am 6d4507fc: am 9566ecd9: am 79399931: Merge "Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting" into lmp-dev 
* commit '6d4507fcbeb8a550156efa7cd94cd69f041b5835':
  Fix issue #16467284: Make noteStartVideo and noteStartAudio nesting
 2014-07-23 17:18:32 +00:00
Sander Alewijnse
549d39e549 am f3c523e0: am ce1088a6: am fcb490a2: Merge "Add Device Policy API to disable screen capture." into lmp-dev 
* commit 'f3c523e06217b19ae8389f9ca8be71ed2cd9fe7b':
  Add Device Policy API to disable screen capture.
 2014-07-23 17:18:27 +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
d73aa15516 am a98f35ba: am dfe72ae3: am 69c976c6: Merge "Expose NETWORK_SCORE_SERVICE as @SystemApi." into lmp-dev 
* commit 'a98f35ba7e61f75123a8829a7e2368e6bc138a03':
  Expose NETWORK_SCORE_SERVICE as @SystemApi.
 2014-07-23 17:02:44 +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
a80c81470c am 50c8ab40: am a6501c7a: am 0062e49d: Merge "Fix unknown tag @throw" into lmp-dev 
* commit '50c8ab40e3c46561a9a9f5e8eb518fdf960a73cf':
  Fix unknown tag @throw
 2014-07-23 14:42:59 +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
73cc43da36 am f03ef334: am 43387c0c: am eb6f138b: Honor the sort and group keys for notification ranking. 
* commit 'f03ef334c4e91643ba834d136b489f28cfbaf117':
  Honor the sort and group keys for notification ranking.
 2014-07-23 14:32:35 +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
839ebf934f am 632fc54e: am 1ef27c1c: am 8980a58d: Merge "Revert "Honor the sort and group keys for notification ranking."" into lmp-dev 
* commit '632fc54ee1c4ca2fb29408a6a65be02ba3e66f3a':
  Revert "Honor the sort and group keys for notification ranking."
 2014-07-23 13:26:39 +00:00
Chris Wren
bd65c7ac28 am 09401565: am 14d65e68: am df09d4c3: Honor the sort and group keys for notification ranking. 
* commit '09401565fa471596b37e9780c347c54cedbb84a8':
  Honor the sort and group keys for notification ranking.
 2014-07-23 13:26:31 +00:00
Bryan Mawhinney
fbeaead282 am 3e90363e: am 64ccca0d: am d5d3525a: Store actions passed to MediaStyle.setShowActionsInCompactView in extras 
* commit '3e90363e815629318d65bb8e2b98b2b9efa9c882':
  Store actions passed to MediaStyle.setShowActionsInCompactView in extras
 2014-07-23 13:26:18 +00:00
Jungshik Jang
d611df99dc am 7722d859: am c1d403f6: am da251030: Add startTimerRecording api to IHdmiControlService. 
* commit '7722d859bb4c4e54632ddf7529e4bfca7dff00a7':
  Add startTimerRecording api to IHdmiControlService.
 2014-07-23 13:26:10 +00: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