Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,874 Commits 3 Branches 0 Tags
0c13fa8466e3c7702fffc781f54851df45bab590
Commit Graph

48574 Commits

Author SHA1 Message Date
Andrew Flynn
0c13fa8466 am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '21a4f17c942165684bc590de594984912459396d':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:07:10 +00:00
Andrew Flynn
21a4f17c94 Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 2015-06-08 19:59:51 +00:00
Andrew Flynn
2b5348b413 Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService" 
This reverts commit 7f8be9d89b.

Change-Id: Ib99d2b8f83c2775cf5df4330a4f20bc791a83e5e
 2015-06-08 19:59:29 +00:00
Dianne Hackborn
530deec05e am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '54d729b73f54798d3112129894cb6fe8ef75920b':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 19:56:48 +00:00
Mike Lockwood
74beaed319 am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit '383ce580b1c9e706d1b06a23d81986f3b4ed83fb':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 19:51:32 +00:00
Dianne Hackborn
54d729b73f Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 2015-06-08 19:46:24 +00:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00
Andrew Flynn
410bceba5b am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit '2429e6a8d96a4eba83e22c35595fa05e0f5e51f2':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-08 17:38:55 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Tim Kilbourn
97e7873ee1 am 72285e56: API review: Update hasMic to hasMicrophone. 
* commit '72285e5600fad17c42730d6f84164d8425d4d43c':
  API review: Update hasMic to hasMicrophone.
 2015-06-08 17:02:25 +00:00
Clara Bayarri
958f94ad8d am 2ea838d5: Merge "Remove insertion action mode runnable on selection start" into mnc-dev 
* commit '2ea838d539ec13215554e40303a757ea4a1f3d39':
  Remove insertion action mode runnable on selection start
 2015-06-08 17:02:14 +00:00
Tim Kilbourn
f9eb35eb6a am 159f558a: Merge "Pass an args bundle to launchAssistAction." into mnc-dev 
* commit '159f558a39d200e08e06245d64ec1df9a08e7d93':
  Pass an args bundle to launchAssistAction.
 2015-06-08 17:01:55 +00:00
Tim Kilbourn
72285e5600 API review: Update hasMic to hasMicrophone. 
Also make the SearchEvent constructor available for testing.

Bug: 21572283
Bug: 21572676
Change-Id: I35cfd88b45aeb97b6ccf83aeb46b0ecc4bbc0947
 2015-06-08 16:52:36 +00:00
Clara Bayarri
2ea838d539 Merge "Remove insertion action mode runnable on selection start" into mnc-dev 2015-06-08 16:51:00 +00:00
Tim Kilbourn
159f558a39 Merge "Pass an args bundle to launchAssistAction." into mnc-dev 2015-06-08 16:46:42 +00:00
Clara Bayarri
7184c8aaf1 Remove insertion action mode runnable on selection start 
This was in a previous change and accidentally got reverted on a rebase.
When going from an Insertion to a Selection/Drag Mode we want to make
sure no insertion modes are started by pending requests.

Previous change with accidental rebase:
I91bcd0d9c3e68d9c736698fe0bec010b4c9f5cf3

Bug: 21647271
Change-Id: I32c152494d236b693a489ea97448904163c9620a
 2015-06-08 17:46:30 +01:00
John Spurlock
04ce57d972 am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev 
* commit '20ac61b8c0abd5af4ce32707e01cc1a501cbb7f0':
  Zen: New user flow for requesting DND access.
 2015-06-08 16:45:49 +00:00
George Mount
a0d57af11b am 616bb3d5: Merge "API Council changes." into mnc-dev 
* commit '616bb3d50c79842eeb5183d8637bc3a270a7d1a0':
  API Council changes.
 2015-06-08 16:45:44 +00:00
John Spurlock
20ac61b8c0 Merge "Zen: New user flow for requesting DND access." into mnc-dev 2015-06-08 16:39:36 +00:00
George Mount
616bb3d50c Merge "API Council changes." into mnc-dev 2015-06-08 16:36:22 +00:00
John Spurlock
7c74f78a85 Zen: New user flow for requesting DND access. 
- User flow is now similar to requesting access to notification
   content, namely prompting the user to visit a settings page
   for enabling/disabling apps access.
 - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent
   for apps to listen to this state change.
 - Removed obsolete request method and associated internal callback
   aidl.
 - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission
   for apps to include as a signal that they want to request this access
   (and therefore appear in the list on the settings page).
 - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted
   and link to this method elsewhere.
 - NoManService now persists the user-enabled package list across reboots
   and does so per-user.
 - Rename public settings intent to correspond with the noman api.

Bug: 21621663
Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
 2015-06-08 11:53:35 -04:00
Mady Mellor
58f9414499 am e1f3214e: Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 
* commit 'e1f3214e72b63ed7cbe368005622055f80da0e0d':
  Change stylus button press to context click in View - API review feedback
 2015-06-08 15:18:46 +00:00
Mady Mellor
20829525cc am a54a8626: Merge "Change stylus button press to context click in GD - API review feedback" into mnc-dev 
* commit 'a54a8626ed77c5641adfb3dbcfdc9bf463478101':
  Change stylus button press to context click in GD - API review feedback
 2015-06-08 15:18:39 +00:00
Mady Mellor
e1f3214e72 Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 2015-06-08 15:11:32 +00:00
Mady Mellor
a54a8626ed Merge "Change stylus button press to context click in GD - API review feedback" into mnc-dev 2015-06-08 15:11:10 +00:00
George Mount
5c91771af2 am 7c79c82b: Merge "Don\'t cause requestLayout when transition changes Visibility." into mnc-dev 
* commit '7c79c82b97dd7445974e740e8e58ca5dbb4fb121':
  Don't cause requestLayout when transition changes Visibility.
 2015-06-08 14:25:17 +00:00
George Mount
7c79c82b97 Merge "Don't cause requestLayout when transition changes Visibility." into mnc-dev 2015-06-08 14:18:13 +00:00
Kenny Guy
8bf71ef27d am a73e4599: Merge "Correct the docs for getUserBadgedIcon" into mnc-dev 
* commit 'a73e4599506a1d3498ef5e9c240d79d7125fd2e9':
  Correct the docs for getUserBadgedIcon
 2015-06-08 12:47:02 +00:00
Kenny Guy
a73e459950 Merge "Correct the docs for getUserBadgedIcon" into mnc-dev 2015-06-08 12:34:26 +00:00
Abodunrinwa Toki
36961252d1 am 7d3b8833: Merge "Fix ActionMode.snooze API" into mnc-dev 
* commit '7d3b8833df5857f5cc70d6c101abe7501fa22b49':
  Fix ActionMode.snooze API
 2015-06-08 11:44:51 +00:00
Abodunrinwa Toki
7d3b8833df Merge "Fix ActionMode.snooze API" into mnc-dev 2015-06-08 11:36:19 +00:00
Martijn Coenen
443afdddea am 6280481a: Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 
* commit '6280481af6a7fb2631012a34b03b2d6b0d01eae5':
  Remove NFC CardEmulation dynamic resource APIs.
 2015-06-08 09:35:01 +00:00
Martijn Coenen
6280481af6 Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 2015-06-08 08:05:14 +00:00
Seigo Nonaka
79e6cfcf1c am dcfbb618: Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into mnc-dev 
* commit 'dcfbb618e33f432d83c56a79e71aeec5d81bbacd':
  Catch BadTokenException and continue in clearInsetofPreviousIme.
 2015-06-08 05:45:05 +00:00
Seigo Nonaka
e937216c33 Catch BadTokenException and continue in clearInsetofPreviousIme. 
This is a follow up CL for Ib04967f39b2529251e4835c42e9f99dba2cf43f2.
As well explained in the I2c21573cf972145ab08e66604cdb9344139a3f31,
the race condition here cannot be avoided without an unacceptable
performance penalty.  For now, we follow the same way.

Bug: 21600287
Change-Id: I0ffdf8bf7e8a53cf8aba1339024b32da65d4f32d
 2015-06-08 12:47:25 +09:00
Jae Seo
7956baa723 am 683e3cfe: Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 
* commit '683e3cfef17bb1a80d7c387200ac491e663d5af2':
  MediaController: Keep the controller when touch exploration is enabled
 2015-06-06 05:16:57 +00:00
Jae Seo
683e3cfef1 Merge "MediaController: Keep the controller when touch exploration is enabled" into mnc-dev 2015-06-06 05:06:07 +00:00
Adam Skory
f7606047ee am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent 
* commit 'e76e7014c7aa22f56f1b82c87d9d80106b5ddcc1':
  Don't forget to parcel mIsAppProvidedIntent
 2015-06-06 01:20:36 +00:00
Adam Skory
e76e7014c7 Don't forget to parcel mIsAppProvidedIntent 
If you forget to parcel it like I did, it's
not going to do you much good.

Change-Id: I85191594e7ffab2c36aeed317932b126da288bdf
 2015-06-05 19:08:01 -06:00
Adam Skory
dd3899aee7 am a28863e7: Merge "Record provision of custom Intents in AssistContent" into mnc-dev 
* commit 'a28863e76979a3551509d8e5eccf3a1c7c604022':
  Record provision of custom Intents in AssistContent
 2015-06-06 01:07:39 +00:00
Adam Skory
a28863e769 Merge "Record provision of custom Intents in AssistContent" into mnc-dev 2015-06-06 01:01:00 +00:00
Adam Skory
cd70c64f50 Record provision of custom Intents in AssistContent 
Simplifies behavior wrt automatically setting the
web URI for ACTION_VIEW Intents, by not doing so
for custom Intents.

Adds a boolean isAppProvidedIntent() as a signal for
recepients of the AssistContent that a custom Intent
was provided. Custom Intents are more likely to be
relevant.

Change-Id: Ibe4bfa040eba904411b9820ab4ddfcf509413829
 2015-06-05 18:55:29 -06:00
Eino-Ville Talvala
fa6a4729e0 am 76233f06: Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 
* commit '76233f068bde3c19d1d0986efee4fb21df973ed5':
  Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED
 2015-06-06 00:49:45 +00:00
Eino-Ville Talvala
76233f068b Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" into mnc-dev 2015-06-06 00:40:16 +00:00
Jae Seo
63d37d9f16 MediaController: Keep the controller when touch exploration is enabled 
Also added missing final and @Override keywords

Bug: 17199815
Change-Id: If96554e36799557a2d81767f287aeb446e4a1983
 2015-06-05 17:27:30 -07:00
George Mount
e5a93aa81c Don't cause requestLayout when transition changes Visibility. 
Bug 21400515

When a Visibility transition temporarily changes a View's
visibility, it should not cause a requestLayout or any other
action, such as focus change. This adds a hidden method to
View to allow it to tweak the visibility without causing
other side-effects.

Change-Id: I5a06149983051319080130e5b5e7cc7edda8dd3e
 2015-06-05 17:21:40 -07:00
Heidi von Markham
ea5d021615 am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev 
* commit '25af46b07d0dbe0f5800a17c231942e4eea7aa99':
  Camera2: add missing HFR implementation
 2015-06-06 00:17:42 +00:00
Ruben Brunk
b31e547597 am 8f955f89: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev 
* commit '8f955f89c2ff19aac7f3e009c825beda3618f630':
  Add UI for camera + flashlight battery reporting.
 2015-06-06 00:17:13 +00:00
Etan Cohen
d40a83543a Merge commit 'bff7b32' into merge 2015-06-05 17:15:18 -07:00
Zhijun He
d3bc26a853 Merge "Camera2: add missing HFR implementation" into mnc-dev 2015-06-06 00:06:46 +00:00