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

199967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Burk
bcdf0dc199 Merge "MIDI docs: use getPorts()" into mnc-dev 2015-06-09 22:16:44 +00:00
Tyler Gunn
f9118d0347 am 69c4e2c5: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 
* commit '69c4e2c57eb587709452d3319136da19db5e465b':
  Remove use of STATE_AUDIO_ONLY in a comparison.
 2015-06-09 22:14:08 +00:00
Xiyuan Xia
000d533959 am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit '12149b699e21a6c11285391c1fcef25a07fcf066':
  Add setting for assistant
 2015-06-09 22:14:03 +00:00
Stefan Kuhne
7dcf08c6b2 Dont create a dummy animation for a transferred animation 
When multiple windows get created at once, multiple starting windows
will be created as well. The first window will get an animation and a
dummy animation. If another window will get shown shortly after, it
will receive the animation of the first starting window. However, no
new dummy animation should be created for it since otherwise it might
never get an animation end notification.

This CL also reverts previously added changes to ignore dummy animations.

reverted change: Ie907d31f51e130e245a70249a983d490f3d42b21

Bug: 21643278
Bug: 21403998
Change-Id: I228d77a2d9c3597df0eb9c340a65c0c592c35ce6
 2015-06-09 12:10:58 -10:00
Casper Bonde
63ddfba1ea am 27850204: am 3b3d1fea: SAP: Make it possible to enforce a 16-digit pin code (4/5) 
* commit '278502040d77f1dfa4fe7f9f724095ba49fba218':
  SAP: Make it possible to enforce a 16-digit pin code (4/5)
 2015-06-09 22:05:09 +00:00
Tyler Gunn
69c4e2c57e Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 2015-06-09 22:04:10 +00:00
Xiyuan Xia
12149b699e Merge "Add setting for assistant" into mnc-dev 2015-06-09 22:00:32 +00:00
Tao Bao
f2a91ee148 Improve the reboot-to-recovery dialogs 
To address the UX comments, this CL modifies the dialogs when the
device is rebooted to install an update or to perform factory data
reset.

Bug: 20949086
(cherry picked from commit 81dce6631396012e8b722bbed6d003f584800ae1)
Change-Id: I6d0cbbbaf184806366c6581c1c2e7dbcc5d89a17
 2015-06-09 14:59:15 -07:00
Tao Bao
fa861429f7 Wait for uncrypt to finish before rebooting 
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. For larger packages, uncrypt may be
killed before it finishes the work after the timeout. Change to monitor
the uncrypt status and show the progress to user.

Needs matching changes in bootable/recovery/uncrypt, system/core and
external/sepolicy.

Also pick up the two NPE fixes in commits
9bb765448df43d41e0a3edb7de1d1641c9251c35 and
da3f63ffb87397943546a7c5c893ce98f2489df2.

Bug: 20012567
Bug: 20949086
(cherry picked from commit 90237f7beb55dae79cdcba5271f96be778573737)
Change-Id: Ibf2fc80032967e5f6cda3cd469005dd29665c87c
 2015-06-09 14:58:13 -07:00
Winson Chung
5a8ba72de9 am 99eb2d70: am b89ed4b9: am 6f024937: Merge "Skip recents preloading when there is no task to animate to." into mnc-dev 
* commit '99eb2d7006c80bd150a367130ff8582e094f37e2':
  Skip recents preloading when there is no task to animate to.
 2015-06-09 21:54:08 +00:00
Casper Bonde
278502040d am 3b3d1fea: SAP: Make it possible to enforce a 16-digit pin code (4/5) 
* commit '3b3d1fea94318a4892fbd4353269749af417a81a':
  SAP: Make it possible to enforce a 16-digit pin code (4/5)
 2015-06-09 21:52:19 +00:00
Casper Bonde
3b3d1fea94 SAP: Make it possible to enforce a 16-digit pin code (4/5) 
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I3205013f9e758c353381442a86845dab467780f8
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-09 21:42:22 +00:00
Dianne Hackborn
ffa0f10ddd am 51bcd672: am 1a18d087: am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 
* commit '51bcd6728b30bcef6f89e710fec25a9a081bb46b':
  Fix issue #21571700: Need to be smarter about how foreground...
 2015-06-09 21:42:14 +00:00
Paul Miller
1bb1f05144 am d8d9a0b2: am 057491d6: am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit 'd8d9a0b20ff61bfb4ba544958445236806cf0cf8':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:42:08 +00:00
Winson Chung
99eb2d7006 am b89ed4b9: am 6f024937: Merge "Skip recents preloading when there is no task to animate to." into mnc-dev 
* commit 'b89ed4b98093f1b7db4a8d8228e8455d4092e5d3':
  Skip recents preloading when there is no task to animate to.
 2015-06-09 21:38:39 +00:00
Tyler Gunn
bc6f12ee42 Remove use of STATE_AUDIO_ONLY in a comparison. 
- Cleanup javadoc to make it more explicit how to use STATE_AUDIO_ONLY.
- Use VideoProfile.isAudioOnly() instead of doing == comparison.

Bug: 21645094
Change-Id: I5a67290a996f8f338aebab72a4d3cb57f1b1993b
 2015-06-09 14:34:11 -07:00
Dianne Hackborn
51bcd6728b am 1a18d087: am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 
* commit '1a18d087d7c31ee037c9583949f5ecc34ae96479':
  Fix issue #21571700: Need to be smarter about how foreground...
 2015-06-09 21:26:09 +00:00
Paul Miller
d8d9a0b20f am 057491d6: am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit '057491d65dfceafad9bae3ddad2c0faafdc4236f':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:26:03 +00:00
Winson Chung
b89ed4b980 am 6f024937: Merge "Skip recents preloading when there is no task to animate to." into mnc-dev 
* commit '6f024937c11bd9e1ad0aa2ab9ae05e14eae5063a':
  Skip recents preloading when there is no task to animate to.
 2015-06-09 21:24:55 +00:00
Xiyuan Xia
e6de8b9ad4 Add setting for assistant 
- Add assistant setting in Settings.Secure;
- If the assistant setting is missing, start assistant as current behavior;
- If the setting is present, start assistant use the setting value;

Bug:20210110
Change-Id: I946fbb504452e445879ad688130a1570b857b9c5
 2015-06-09 14:21:38 -07:00
Winson Chung
6f024937c1 Merge "Skip recents preloading when there is no task to animate to." into mnc-dev 2015-06-09 21:18:18 +00:00
Dianne Hackborn
a3acdb33df Fix issue #21621920: VI: need mechanism to get current request 
Add new APIs to associate a Request with a name, get all active
requests, and get active request by name.

Also add a new Activity.onProvideReferrer() which will allow
applications to propagate referrer information to the assistant
(and other apps they launch) in a consistent way.

Change-Id: I4ef74b5ed07447da9303a74a1bdf42e4966df363
 2015-06-09 14:15:49 -07:00
Dianne Hackborn
1a18d087d7 am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 
* commit 'ea7438e4a698945b3e3a7786cff726c337291a68':
  Fix issue #21571700: Need to be smarter about how foreground...
 2015-06-09 21:12:33 +00:00
Paul Miller
057491d65d am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit '87a19e25fe736a0fe92a0b4e8490136350519393':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:12:28 +00:00
Dianne Hackborn
ea7438e4a6 Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 2015-06-09 21:08:17 +00:00
Yohei Yukawa
e55669e4df am be9ed058: am 3f501b9b: am 62974816: Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 
* commit 'be9ed058c6c3c51135a91d476b7adb94bd497f9c':
  Do not accept an empty string in EditorInfo#packageName anymore.
 2015-06-09 21:06:16 +00:00
Paul Miller
87a19e25fe Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 2015-06-09 21:00:32 +00:00
Yohei Yukawa
be9ed058c6 am 3f501b9b: am 62974816: Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 
* commit '3f501b9b0ece289f1ee5b35b96efc9109255d7e6':
  Do not accept an empty string in EditorInfo#packageName anymore.
 2015-06-09 20:55:05 +00:00
Winson Chung
a278cae54c Skip recents preloading when there is no task to animate to. 
Bug: 21696081
 2015-06-09 13:51:13 -07:00
Chris Craik
f396f011ee Dont ignore layer paint alpha in software path 
bug:19412691

Change-Id: Ie56b2cbc667a078eb4a7c5bfe7b8e8dd6b0fc24b
 2015-06-09 13:50:01 -07:00
Fyodor Kupolov
a8a17564fb am b8c8988c: am 5fa782c8: am 7e8e29ad: Merge "Fixed compile error caused by final keyword" into mnc-dev 
* commit 'b8c8988cfaedcbc5fb62fb286d97575c7cd18deb':
  Fixed compile error caused by final keyword
 2015-06-09 20:48:01 +00:00
Alex Klyubin
e86a79f49e am 53c1bbf8: am 009d8dc8: am 6a0b8f4d: Merge "Switch Android Keystore key gen and import to new KeyStore API." into mnc-dev 
* commit '53c1bbf89f8fcd36423dcfc74f11d17035d0e741':
  Switch Android Keystore key gen and import to new KeyStore API.
 2015-06-09 20:47:55 +00:00
Alex Klyubin
f937963b28 am 29cc742a: am 89f69c4c: am 8ef015be: Merge "Support for Android Keystore Cipher.wrap and unwrap." into mnc-dev 
* commit '29cc742aae0cd71fe26e4603511ff8ba096f5070':
  Support for Android Keystore Cipher.wrap and unwrap.
 2015-06-09 20:47:50 +00:00
Yorke Lee
1cf9a15922 am 3a7645cc: am 013b32b9: am 03123839: Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev 
* commit '3a7645ccd460f2ff283d0e36b6a9d0c4a48fbdc5':
  Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS
 2015-06-09 20:47:44 +00:00
Tom Hudson
48ee99afa2 Merge "drawBitmap() support for extractSubset()" 2015-06-09 20:41:30 +00:00
Yohei Yukawa
3f501b9b0e am 62974816: Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 
* commit '62974816a325fa6ea49d6f9800b962af85a9856a':
  Do not accept an empty string in EditorInfo#packageName anymore.
 2015-06-09 20:40:07 +00:00
Fyodor Kupolov
b8c8988cfa am 5fa782c8: am 7e8e29ad: Merge "Fixed compile error caused by final keyword" into mnc-dev 
* commit '5fa782c813d52dff228b3e982ee9e2249b861163':
  Fixed compile error caused by final keyword
 2015-06-09 20:34:29 +00:00
Alex Klyubin
53c1bbf89f am 009d8dc8: am 6a0b8f4d: Merge "Switch Android Keystore key gen and import to new KeyStore API." into mnc-dev 
* commit '009d8dc8dcf1fa0194b911aca58d7daa7f232c86':
  Switch Android Keystore key gen and import to new KeyStore API.
 2015-06-09 20:34:23 +00:00
Alex Klyubin
29cc742aae am 89f69c4c: am 8ef015be: Merge "Support for Android Keystore Cipher.wrap and unwrap." into mnc-dev 
* commit '89f69c4c5a211ae20628f973dcdbb9f52864fbe7':
  Support for Android Keystore Cipher.wrap and unwrap.
 2015-06-09 20:34:18 +00:00
Yorke Lee
3a7645ccd4 am 013b32b9: am 03123839: Merge "Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS" into mnc-dev 
* commit '013b32b913f1cfd806d30149f5263a7169e4c50c':
  Rename TelecomManager.EXTRA_INCOMING_CALL_ADDRESS
 2015-06-09 20:34:13 +00:00
Jason Monk
4508d22d29 am 92285c2a: am a11e4afc: am eac27519: Merge "Add hotspot accessibility description" into mnc-dev 
* commit '92285c2ad488997fa612d3fb3c550132be1d470e':
  Add hotspot accessibility description
 2015-06-09 20:33:46 +00:00
Adam Lesinski
8d14acf391 am 96e111db: am 029a8be3: am c33062ff: Merge "AAPT2: Proguard rules generation added." into mnc-dev 
* commit '96e111db92efc544fd81868f0cb97eab5c8a95d9':
  AAPT2: Proguard rules generation added.
 2015-06-09 20:33:41 +00:00
John Spurlock
219dc0d321 am fb976bfa: am c76c2623: am 93f6fe95: Merge "Fix horrible warning on every systemui startup." into mnc-dev 
* commit 'fb976bfa72a25baa18165af5de707ee9149fec0b':
  Fix horrible warning on every systemui startup.
 2015-06-09 20:33:35 +00:00
Yohei Yukawa
62974816a3 Merge "Do not accept an empty string in EditorInfo#packageName anymore." into mnc-dev 2015-06-09 20:30:56 +00:00
Andrew Flynn
ceaed68b07 notifyCarrierNetworkChange:TelephonyManager->CarrierService 
Re-checkin of 7f8be9d89b7f294bf5e5d377908a5c74d2f4968f.

ORIGINAL CHANGES:

Per API review, move TelephonyManager.notifyCarrierNetworkChange() to
CarrierService.notifyCarrierNetworkChange(). Underlying telephony
implementation remains unchanged.

Also minor tweaks to CarrierService:
* Remove some unnecessary @hide
* Remove final qualifier from onBind() so that subclasses can handle
  new internal callers that want to bind to it.

ADDITIONAL CHANGES:

- Fixes stack so that a SecurityException is thrown when caller
  does not have MODIFY_PHONE_STATE or carrier privileges.

Bug: 21572049
Bug: 21630803
Bug: 21721768

Change-Id: Ie952651d2f15c370de713ed8abb6d9f6f07dd2b4
 2015-06-09 16:28:54 -04:00
Jason Monk
92285c2ad4 am a11e4afc: am eac27519: Merge "Add hotspot accessibility description" into mnc-dev 
* commit 'a11e4afc34bb2a3aa17795e6bee21fde7406665a':
  Add hotspot accessibility description
 2015-06-09 20:24:57 +00:00
Adam Lesinski
96e111db92 am 029a8be3: am c33062ff: Merge "AAPT2: Proguard rules generation added." into mnc-dev 
* commit '029a8be3284babbe6a4f948f79a67204359dbc49':
  AAPT2: Proguard rules generation added.
 2015-06-09 20:24:52 +00:00
John Spurlock
fb976bfa72 am c76c2623: am 93f6fe95: Merge "Fix horrible warning on every systemui startup." into mnc-dev 
* commit 'c76c26236a7a4a3fd061023db0ff47ef8a793238':
  Fix horrible warning on every systemui startup.
 2015-06-09 20:24:47 +00:00
Adam Lesinski
c332a4e0b5 am 0db2df0c: am 1d050cff: am f17138f0: Merge "Fix calculation of power drain from BT and WiFi" into mnc-dev 
* commit '0db2df0c28d39f7957289910bc860e09294ca3ab':
  Fix calculation of power drain from BT and WiFi
 2015-06-09 20:21:30 +00:00
Fyodor Kupolov
5fa782c813 am 7e8e29ad: Merge "Fixed compile error caused by final keyword" into mnc-dev 
* commit '7e8e29ad2e5e8a722db163f5e740ba3453c45d9b':
  Fixed compile error caused by final keyword
 2015-06-09 20:21:29 +00:00