Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199,381 Commits 3 Branches 0 Tags
5ffc32a3133daa67ce2467be17b0149673e8b5a4
Commit Graph

53587 Commits

Author SHA1 Message Date
Adam Lesinski
5ffc32a313 am e4768b42: am 2ce589b1: am 4cf59747: Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 
* commit 'e4768b42072c2bd7d76b0122fc6119e7305b7571':
  Bump the BatteryStats parcel VERSION
 2015-06-08 23:48:56 +00:00
Adam Lesinski
e4768b4207 am 2ce589b1: am 4cf59747: Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 
* commit '2ce589b1dbba5bb25cb00de773a2275cec636829':
  Bump the BatteryStats parcel VERSION
 2015-06-08 23:41:07 +00:00
Adam Lesinski
4cf59747f8 Merge "Bump the BatteryStats parcel VERSION" into mnc-dev 2015-06-08 23:14:17 +00:00
Jonathan Basseri
2ec7cd161f am d441f0bb: am 3efdf81d: am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit 'd441f0bb97a751f6ce1042431a7395eeb1d6b4c6':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 23:09:41 +00:00
Jonathan Basseri
d441f0bb97 am 3efdf81d: am 623bf636: Merge "Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId" into mnc-dev 
* commit '3efdf81da089a4c6604c798a1abedb4fce70ee60':
  Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId
 2015-06-08 22:50:06 +00:00
Adam Lesinski
df6235cd76 Bump the BatteryStats parcel VERSION 
A previous change forgot to bump the version, leading to
corrupt data.

Bug:19683715
Bug:21574065
Change-Id: I30c9039694b02d576909e8f60c25f175986b8c5c
 2015-06-08 15:04:16 -07:00
Jonathan Basseri
5ea0c8f1c6 Rename reloadCarrierConfigForSubId -> notifyConfigChangedForSubId 
Per discussion with API council, "notify" makes more sense than "reload"
here.

Bug: 21571894
Change-Id: I7e8e8d91d8e6e6d4502cf371472fd82efa3e97f5
 2015-06-08 14:59:09 -07:00
Etan Cohen
1c4de6a1a4 am dd8ed093: am 03609df3: am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 
* commit 'dd8ed09397cb3bcbc89b1864543854dc027c68c8':
  Update documentation of CARRIER_PRESENCE & bitmasks.
 2015-06-08 21:09:14 +00:00
Etan Cohen
dd8ed09397 am 03609df3: am 76316977: Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 
* commit '03609df355228390a98d5669cb1a53e83f8343a9':
  Update documentation of CARRIER_PRESENCE & bitmasks.
 2015-06-08 20:51:59 +00:00
Wale Ogunwale
92839dfe61 am 152b03e8: am 549ac692: am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 
* commit '152b03e85260463fe00c1157a172f6e068261012':
  Use DisplayAdjustments when creating display in ResourceManager
 2015-06-08 20:46:23 +00:00
Wale Ogunwale
152b03e852 am 549ac692: am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 
* commit '549ac6925a28bf185515334a99cffb2048f0708a':
  Use DisplayAdjustments when creating display in ResourceManager
 2015-06-08 20:37:43 +00:00
Andrew Flynn
6d0a068a47 am 9e2296e2: am 1292b596: am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '9e2296e2e02a779ef855f02fabac139869e443cc':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:34:42 +00:00
Etan Cohen
7631697793 Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev 2015-06-08 20:29:14 +00:00
Andrew Flynn
9e2296e2e0 am 1292b596: am 21a4f17c: Merge "Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"" into mnc-dev 
* commit '1292b5961214229e893c09b8ca85ef1461a54737':
  Revert "notifyCarrierNetworkChange:TelephonyManager->CarrierService"
 2015-06-08 20:21:33 +00:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Dianne Hackborn
143dd60bff am 82aa5f2c: am 09653fc5: am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '82aa5f2cf5b78a76c2bd1502f9ed9d995028f21a':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 20:15:32 +00:00
Mike Lockwood
6e48b76640 am e89f9d8a: am ac4c704b: am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit 'e89f9d8af721d2be7369f9c361cfa566f6a24757':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 20:15:26 +00:00
Etan Cohen
e4dc7e1ac3 Update documentation of CARRIER_PRESENCE & bitmasks. 
Bug: 21572292
Change-Id: If4727e7c18ce94f7c715ac91d61456ff0de10001
 2015-06-08 13:02:44 -07:00
Dianne Hackborn
82aa5f2cf5 am 09653fc5: am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 
* commit '09653fc5ee5f2050f61e055d773d0f873c71b6db':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
 2015-06-08 20:02:02 +00:00
Mike Lockwood
e89f9d8af7 am ac4c704b: am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 
* commit 'ac4c704b4ef233f12c649f6e20794dd1aeb28a1d':
  MidiManager: proxy all requests to open devices through MidiService
 2015-06-08 20:01:57 +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
Andrew Flynn
6ada0efdbf am b98430c8: am b443bcce: am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'b98430c84b9afab1e6bbfab31d34502758f9ca82':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-08 19:57:00 +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
Tim Kilbourn
6b051cfe1b am 2f7d4b5f: am 59a1dd78: am 72285e56: API review: Update hasMic to hasMicrophone. 
* commit '2f7d4b5fb2e5df8396c20ff039bc2fbe58d3e39c':
  API review: Update hasMic to hasMicrophone.
 2015-06-08 18:38:41 +00:00
Clara Bayarri
4b41699a5e am f3860658: am e93a4631: am 2ea838d5: Merge "Remove insertion action mode runnable on selection start" into mnc-dev 
* commit 'f386065882e4e29bbb66eec41abe4ca7e8a8ced1':
  Remove insertion action mode runnable on selection start
 2015-06-08 18:38:35 +00:00
Tim Kilbourn
bff5a41235 am 6b3bb7d6: am 0a08108d: am 159f558a: Merge "Pass an args bundle to launchAssistAction." into mnc-dev 
* commit '6b3bb7d66966fd4c2ff99f2fc831970678a82de6':
  Pass an args bundle to launchAssistAction.
 2015-06-08 18:38:22 +00:00
John Spurlock
8a3188e8ea am 202dea41: am 5e73a085: am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev 
* commit '202dea4125f189e242da71c1378699321882671b':
  Zen: New user flow for requesting DND access.
 2015-06-08 18:38:15 +00:00
George Mount
bf927772c9 am 9a74b503: am ac74c77c: am 616bb3d5: Merge "API Council changes." into mnc-dev 
* commit '9a74b5030f04b4d4e6cc202d26ea7aeff4653ed5':
  API Council changes.
 2015-06-08 18:38:09 +00:00
Mady Mellor
3b3fd00bf1 resolved conflicts for merge of 1612c73a to master 
Change-Id: Iffbd707f14fa42c12c35e18ff6826cebd00c7bf8
 2015-06-08 11:33:41 -07:00
Andrew Flynn
b98430c84b am b443bcce: am 2429e6a8: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit 'b443bcce8f4f3e25fe7282d3be96de3747df0660':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-08 18:22:18 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Mady Mellor
bbd2453555 am 0d2365e2: am 0820c666: am a54a8626: Merge "Change stylus button press to context click in GD - API review feedback" into mnc-dev 
* commit '0d2365e27896e622d57bc8d0248fe0f28c750af6':
  Change stylus button press to context click in GD - API review feedback
 2015-06-08 17:23:51 +00:00
Chris Wren
f93cd08698 am 87a1dcba: am 0a769f1d: am aaf68f21: Merge "instrument emergency call button" into mnc-dev 
* commit '87a1dcba0b001dc6e1e28d31872665b51d9794ce':
  instrument emergency call button
 2015-06-08 17:23:45 +00:00
George Mount
32c9721ec8 am 72e3b747: am d00a76ea: am 7c79c82b: Merge "Don\'t cause requestLayout when transition changes Visibility." into mnc-dev 
* commit '72e3b7475cffc86eccc43e372c8299765c313dcd':
  Don't cause requestLayout when transition changes Visibility.
 2015-06-08 17:23:34 +00:00
Kenny Guy
2636114e23 am 9323192c: am 3f8d90be: am a73e4599: Merge "Correct the docs for getUserBadgedIcon" into mnc-dev 
* commit '9323192cd55f808aa9a78b4d22cd308799b1fa89':
  Correct the docs for getUserBadgedIcon
 2015-06-08 17:22:48 +00:00
Abodunrinwa Toki
6f8029494d am f70aa841: am 6bbacb53: am 7d3b8833: Merge "Fix ActionMode.snooze API" into mnc-dev 
* commit 'f70aa84170584eb7efcc048c55bb3a1aebe6d89d':
  Fix ActionMode.snooze API
 2015-06-08 17:22:42 +00:00
Martijn Coenen
add777bd54 am de6294b0: am 2812397f: am 6280481a: Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 
* commit 'de6294b0a20de4b4c0fcd20fc1a491c636e3462c':
  Remove NFC CardEmulation dynamic resource APIs.
 2015-06-08 17:22:35 +00:00
Seigo Nonaka
e07b975c30 am a7bcd727: am a202d86d: am dcfbb618: Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into mnc-dev 
* commit 'a7bcd72787045b6ed6d57dad4aaf1d614147f6b8':
  Catch BadTokenException and continue in clearInsetofPreviousIme.
 2015-06-08 17:22:25 +00:00
Tim Kilbourn
2f7d4b5fb2 am 59a1dd78: am 72285e56: API review: Update hasMic to hasMicrophone. 
* commit '59a1dd7811f36963357b36c1c888a7d4a747f55c':
  API review: Update hasMic to hasMicrophone.
 2015-06-08 17:14:20 +00:00
Clara Bayarri
f386065882 am e93a4631: am 2ea838d5: Merge "Remove insertion action mode runnable on selection start" into mnc-dev 
* commit 'e93a4631fce7e9c1e73380d18f15255032eb46b2':
  Remove insertion action mode runnable on selection start
 2015-06-08 17:14:15 +00:00
Tim Kilbourn
6b3bb7d669 am 0a08108d: am 159f558a: Merge "Pass an args bundle to launchAssistAction." into mnc-dev 
* commit '0a08108d753f2d04da046e6d7792ee33ac2af364':
  Pass an args bundle to launchAssistAction.
 2015-06-08 17:14:02 +00:00
John Spurlock
202dea4125 am 5e73a085: am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev 
* commit '5e73a085c6788670d1e3bec423f346f60d88c977':
  Zen: New user flow for requesting DND access.
 2015-06-08 17:06:13 +00:00
George Mount
9a74b5030f am ac74c77c: am 616bb3d5: Merge "API Council changes." into mnc-dev 
* commit 'ac74c77cc47364855c09e3498d1c1b5f02cbca96':
  API Council changes.
 2015-06-08 17:06:08 +00:00
Mady Mellor
1612c73a8b am b4142e1c: am e1f3214e: Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 
* commit 'b4142e1c6044a5cb5224ae3f968cb3690d0fbbf7':
  Change stylus button press to context click in View - API review feedback
 2015-06-08 17:05:52 +00:00
Mady Mellor
0d2365e278 am 0820c666: am a54a8626: Merge "Change stylus button press to context click in GD - API review feedback" into mnc-dev 
* commit '0820c666f29fc5c879aece7402a3d6eb58394565':
  Change stylus button press to context click in GD - API review feedback
 2015-06-08 17:05:46 +00:00
Chris Wren
87a1dcba0b am 0a769f1d: am aaf68f21: Merge "instrument emergency call button" into mnc-dev 
* commit '0a769f1dd8fd953408270db35063a97a6302d784':
  instrument emergency call button
 2015-06-08 17:05:41 +00:00
George Mount
72e3b7475c am d00a76ea: am 7c79c82b: Merge "Don\'t cause requestLayout when transition changes Visibility." into mnc-dev 
* commit 'd00a76eabe9603972b5d898fcee90c0a61c5e238':
  Don't cause requestLayout when transition changes Visibility.
 2015-06-08 17:05:30 +00:00
Kenny Guy
9323192cd5 am 3f8d90be: am a73e4599: Merge "Correct the docs for getUserBadgedIcon" into mnc-dev 
* commit '3f8d90bee9eb87f311bdfab003f4bc299527930e':
  Correct the docs for getUserBadgedIcon
 2015-06-08 17:04:47 +00:00