drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,648 Commits 1 Branch 0 Tags
Commit Graph

197648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dimitry Ivanov
25bb4553f3 Merge "Revert "Print exception stacktrace on failed scanPackageLI"" into mnc-dev 2015-06-08 17:28:25 +00:00
Amit Mahajan
829c097761 Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev 2015-06-08 17:27:29 +00:00
Amit Mahajan
9b5e2124d0 Merge "Changing getSimState to use slot idx instead of sub id." into mnc-dev 2015-06-08 17:26:03 +00:00
Andrew Flynn
2429e6a8d9 Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 2015-06-08 17:25:12 +00:00
Wale Ogunwale
5265fc9689 am 7fa228f4: Merge "Release voice wake lock at end of voice interaction session" into mnc-dev 
* commit '7fa228f4eaa774df9e925e0c037f0fa78caafafc':
  Release voice wake lock at end of voice interaction session
 2015-06-08 17:18:11 +00:00
Alex Klyubin
4350babc02 Remove deprecated android.security.KeyStore methods. 
* delKey -> delete
* getPubkey -> exportKey
* saw -> list.

Bug: 18088752
Change-Id: Ifb794f91a42646d67da1340ee16765cbaf255a49
 2015-06-08 10:14:58 -07: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
Wale Ogunwale
a47884b386 am 56651bc4: am aac4c5c2: Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" into mnc-dev 
* commit '56651bc459495451cd2069dbc12f990531b1865a':
  Hold service lock when AMS.setProcessMemoryTrimLevel() is called
 2015-06-08 17:14:08 +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
Dimitry Ivanov
47fc7fe7f6 Revert "Print exception stacktrace on failed scanPackageLI" 
This reverts commit 95b7d50ce1a1ae879bbb1b8b8262172744c28d0e.

Bug: 8076853
Change-Id: Ia19e6638a97b7b49561932752a204990e3a486d4
 2015-06-08 17:12:55 +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
Geoff Mendal
bf77c823b8 am 63eecd7f: (-s ours) am 83b4172d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '63eecd7f3e5d7c866044ec1bd6904b93ab7c6fe4':
  Import translations. DO NOT MERGE
 2015-06-08 17:06:03 +00:00
Yorke Lee
e577478fcd am d6880085: am 678cd9f3: Merge "Add telecom extra to specify handle for incoming call" into mnc-dev 
* commit 'd68800856c88a29bf4118b9e7439a038aec42c14':
  Add telecom extra to specify handle for incoming call
 2015-06-08 17:05:57 +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
Geoff Mendal
b3104012c2 am ce3d0532: (-s ours) am 51ddeca8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ce3d0532326ca838bcfceb56f3e80e40c467e371':
  Import translations. DO NOT MERGE
 2015-06-08 17:05:36 +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
Geoff Mendal
1bb64b5fc6 am b523d19f: (-s ours) am 101ba78a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'b523d19fa3cd0dd0ec5269df54f1d3079673a57e':
  Import translations. DO NOT MERGE
 2015-06-08 17:05:25 +00:00
Geoff Mendal
cbc4333555 am ade03c3d: (-s ours) am 29d6e8d3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ade03c3de2ef71f20d439a76cb8df6ac7d51dba2':
  Import translations. DO NOT MERGE
 2015-06-08 17:05:20 +00:00
Jason Monk
34199b6f96 am 2f56b157: am eb738616: Merge "Add demo mode to tuner" into mnc-dev 
* commit '2f56b157944d4c84e27bff56d25b4f461b05570f':
  Add demo mode to tuner
 2015-06-08 17:05:15 +00:00
Geoff Mendal
57a3fd0d2d am cd0f8576: (-s ours) am bff802b3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'cd0f8576872fe7e1ef1f6c71c7904c14e9455d1f':
  Import translations. DO NOT MERGE
 2015-06-08 17:05:10 +00:00
Wale Ogunwale
7fa228f4ea Merge "Release voice wake lock at end of voice interaction session" into mnc-dev 2015-06-08 17:05:09 +00:00
Jason Monk
b81943219c am ee52ca8e: am 8a3a964d: Show Cast Tile when trusted 
* commit 'ee52ca8e17b97a61242b6a92acf52dbe5ec799fb':
  Show Cast Tile when trusted
 2015-06-08 17:05:04 +00:00
Jason Monk
62c54e9b96 am de57f065: am 6236a820: Merge "Setup service for tunable things to use." into mnc-dev 
* commit 'de57f065f391bf1cc3f829f02ca8433ea94233fb':
  Setup service for tunable things to use.
 2015-06-08 17:04:59 +00:00
Lorenzo Colitti
4566d923c3 am 9c68c7c0: am ef2ccf5f: Merge "Correctly time out CMD_START_DHCP." into mnc-dev 
* commit '9c68c7c0a737e25b1dc7f4341a38502976ca23d2':
  Correctly time out CMD_START_DHCP.
 2015-06-08 17:04:53 +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
Abodunrinwa Toki
f70aa84170 am 6bbacb53: am 7d3b8833: Merge "Fix ActionMode.snooze API" into mnc-dev 
* commit '6bbacb53c9584db8b4a7af1e6d3f8a04237b469b':
  Fix ActionMode.snooze API
 2015-06-08 17:04:42 +00:00
Martijn Coenen
de6294b0a2 am 2812397f: am 6280481a: Merge "Remove NFC CardEmulation dynamic resource APIs." into mnc-dev 
* commit '2812397fa6ca2c8ed5662ec9bfd88b0761e175d3':
  Remove NFC CardEmulation dynamic resource APIs.
 2015-06-08 17:04:37 +00:00
Seigo Nonaka
a7bcd72787 am a202d86d: am dcfbb618: Merge "Catch BadTokenException and continue in clearInsetofPreviousIme." into mnc-dev 
* commit 'a202d86d123103089d2cd4f7b6a60ed832acf079':
  Catch BadTokenException and continue in clearInsetofPreviousIme.
 2015-06-08 17:04:31 +00:00
Lorenzo Colitti
af3125cde8 am 4aba8f26: am dc540ea0: Merge "Delete code that checks for the simulator, it\'s long gone." into mnc-dev 
* commit '4aba8f26cdf585bf630e8e4020f5fc1f5322e841':
  Delete code that checks for the simulator, it's long gone.
 2015-06-08 17:04:26 +00:00
James Cook
dd231d466f Use VoiceInteractor.Prompt in VoiceInteraction test app 
The framework API that takes a CharSequence as a prompt is now
deprecated, so update the test code to use the new API.

Bug: 21695917
Change-Id: Ic4b7afa6c547a9885a900ed092910f3c6bdd1dd4
 2015-06-08 10:03:35 -07:00
Tim Kilbourn
59a1dd7811 am 72285e56: API review: Update hasMic to hasMicrophone. 
* commit '72285e5600fad17c42730d6f84164d8425d4d43c':
  API review: Update hasMic to hasMicrophone.
 2015-06-08 17:01:55 +00:00
Clara Bayarri
e93a4631fc 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:01:50 +00:00
Wale Ogunwale
56651bc459 am aac4c5c2: Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" into mnc-dev 
* commit 'aac4c5c28f6699ddcbbc25638e73e5ab42b8360e':
  Hold service lock when AMS.setProcessMemoryTrimLevel() is called
 2015-06-08 17:01:44 +00:00
Tim Kilbourn
0a08108d75 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:40 +00:00
Amit Mahajan
9387f1dfe3 Changing getSimState to use slot idx instead of sub id. 
Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
 2015-06-08 17:01:23 +00:00
Wale Ogunwale
4a922d4700 Release voice wake lock at end of voice interaction session 
Bug: 21615776
Bug: 21615761
Change-Id: I75d568474d4df5f21ea5b616887c6187e54f69e7
 2015-06-08 09:59:54 -07:00
Narayan Kamath
2f4df690e5 am abf7f323: am f5b7778e: Merge "Pass MUTF-8 paths to open(2) instead of UTF-8." 
* commit 'abf7f323400f2b896280aea6f0d512f08feee50b':
  Pass MUTF-8 paths to open(2) instead of UTF-8.
 2015-06-08 16:59:09 +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
John Spurlock
5e73a085c6 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:51:59 +00:00
George Mount
ac74c77cc4 am 616bb3d5: Merge "API Council changes." into mnc-dev 
* commit '616bb3d50c79842eeb5183d8637bc3a270a7d1a0':
  API Council changes.
 2015-06-08 16:51:54 +00:00
Geoff Mendal
63eecd7f3e am 83b4172d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '83b4172d03e2b98d2e5baff5e936c13d6ba78b96':
  Import translations. DO NOT MERGE
 2015-06-08 16:51:49 +00:00
Yorke Lee
d68800856c am 678cd9f3: Merge "Add telecom extra to specify handle for incoming call" into mnc-dev 
* commit '678cd9f37cffa38ec718f36607c644ff1eadb391':
  Add telecom extra to specify handle for incoming call
 2015-06-08 16:51:44 +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
Wale Ogunwale
aac4c5c28f Merge "Hold service lock when AMS.setProcessMemoryTrimLevel() is called" into mnc-dev 2015-06-08 16:50:22 +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