Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,444 Commits 3 Branches 0 Tags
b0a09de8192cce008daff192a18d68040bf1ddbc
Commit Graph

51744 Commits

Author SHA1 Message Date
Svet Ganov
b0a09de819 am 4e2029c0: am 2514a265: am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev 
* commit '4e2029c058966f30a71b1bcea16aa65a5d7f85c4':
  Permission UI - legacy apps support
 2015-05-05 19:23:20 +00:00
John Spurlock
fba7c4eadc am aac2806e: am 0c9c89a1: am 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev 
* commit 'aac2806e085eda5e91c0c5d1ea67de889314f2f0':
  Zen: Remove calendar rule attendance attribute.
 2015-05-05 19:23:09 +00:00
Svet Ganov
4a64b19f23 Merge "Permission UI - legacy apps support" into mnc-dev 2015-05-05 15:34:10 +00:00
Svet Ganov
019d230499 Permission UI - legacy apps support 
Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4
 2015-05-05 08:33:04 -07:00
John Spurlock
0bc8afff7e Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev 2015-05-05 14:42:03 +00:00
Niels Egberts
100860736e Merge "Don't strip country and variant from locale." 2015-05-05 13:54:13 +00:00
John Spurlock
d39af2d3f8 Zen: Remove calendar rule attendance attribute. 
- No longer supporting a filter based on attendance type.
 - Remove from model + condition provider logic.

Bug: 20064962
Change-Id: I0bc16275a2860ab95d4de316b6326a1499003f05
 2015-05-05 09:49:32 -04:00
Tingting Wang
830e158d99 Merge "Add metadata_dirty column to ContactsContract." 2015-05-05 01:41:54 +00:00
Andre Eisenbach
0b9c3610b0 am 112f177c: am 7e66f6f4: am ab258139: BluetoothSap class should not be public 
* commit '112f177c2587fc3ba36bba0f5a7a7dcbb131ef13':
  BluetoothSap class should not be public
 2015-05-05 01:37:36 +00:00
George Mount
1418da5365 am fa8cd17a: am c441dca2: am 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev 
* commit 'fa8cd17a4064f8293b4bbae379769d6e63e0ac4b':
  Fix potential NPE in internal isValidTarget method.
 2015-05-05 01:36:57 +00:00
Andre Eisenbach
5e60b79e39 am 123bbd5a: am 621b790d: am f455986a: Add documentation for BluetoothSocket.getConnectionType() 
* commit '123bbd5aef25d42bf3bf1ea84ccd8d0c08229363':
  Add documentation for BluetoothSocket.getConnectionType()
 2015-05-05 01:36:50 +00:00
George Mount
3a272fec3d am c1d945c6: am 9066d6d7: am c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev 
* commit 'c1d945c65851a39be3f2beae0474de589ee63faa':
  When returning, transition only existing shared elements.
 2015-05-05 01:36:44 +00:00
George Mount
f96481910a am ae49eae1: am c76d048f: am 61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev 
* commit 'ae49eae1d3f0ce9cace3066e092300de45b3fec1':
  Fix Visibility not changing until Animator ends.
 2015-05-05 01:36:27 +00:00
Alan Viverette
21d7cb6f26 am dc49a8bb: am d0dfb237: am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev 
* commit 'dc49a8bb23e765525f1bc752a417cb43cba19dbf':
  Always force constructors accessible during inflation
 2015-05-05 01:36:10 +00:00
Jeff Sharkey
74d3849d51 am 2d73a5a4: am 2a9f87cf: am 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev 
* commit '2d73a5a46c44cc39ffbca615ea87afb3ae647c8a':
  Avoid NPE when fsUuid is null.
 2015-05-05 01:35:59 +00:00
Andre Eisenbach
112f177c25 am 7e66f6f4: am ab258139: BluetoothSap class should not be public 
* commit '7e66f6f4b7992e001b3d5c226f043539b99b7bff':
  BluetoothSap class should not be public
 2015-05-05 01:23:21 +00:00
George Mount
fa8cd17a40 am c441dca2: am 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev 
* commit 'c441dca2e96aa5353442b4ace33184f88e671e33':
  Fix potential NPE in internal isValidTarget method.
 2015-05-05 01:22:48 +00:00
Andre Eisenbach
123bbd5aef am 621b790d: am f455986a: Add documentation for BluetoothSocket.getConnectionType() 
* commit '621b790dc8c3b45f343e44d5e673368a0ceef57a':
  Add documentation for BluetoothSocket.getConnectionType()
 2015-05-05 01:22:43 +00:00
George Mount
c1d945c658 am 9066d6d7: am c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev 
* commit '9066d6d7b6275f2fd46078c0034493b7da399631':
  When returning, transition only existing shared elements.
 2015-05-05 01:22:38 +00:00
George Mount
ae49eae1d3 am c76d048f: am 61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev 
* commit 'c76d048f7166dccbba25757f31db62fae8aabe2a':
  Fix Visibility not changing until Animator ends.
 2015-05-05 01:22:22 +00:00
Alan Viverette
dc49a8bb23 am d0dfb237: am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev 
* commit 'd0dfb237142284e4a6e62337d2610e2b4dd9d8e2':
  Always force constructors accessible during inflation
 2015-05-05 01:22:01 +00:00
Jeff Sharkey
2d73a5a46c am 2a9f87cf: am 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev 
* commit '2a9f87cfdf440ed6cfe92ab3428ca8d193586a2f':
  Avoid NPE when fsUuid is null.
 2015-05-05 01:21:50 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Tingting Wang
03583a4ee3 Add metadata_dirty column to ContactsContract. 
Add metadata_dirty column to RawContacts table, to indicate
metadata related info has been changed.

BUG 20827851

Change-Id: I45ba90bb44f1d3e66b45facd9a643fc77e876e8a
 2015-05-04 16:34:58 -07:00
Andre Eisenbach
ab2581398c BluetoothSap class should not be public 
Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67
 2015-05-04 23:20:28 +00:00
George Mount
57436d3f7e Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev 2015-05-04 22:08:03 +00:00
George Mount
f586c925d5 Fix potential NPE in internal isValidTarget method. 
Bug 19805383

Change-Id: Ib22d86cca5e1225b12ed39ac988824eeb9c58bbd
 2015-05-04 15:01:55 -07:00
Andre Eisenbach
f455986a45 Add documentation for BluetoothSocket.getConnectionType() 
Bug: 20824264
Change-Id: I58aa8f5bbe08ddb252f01f4ad187ae8741963f0b
 2015-05-04 21:56:17 +00:00
George Mount
c81af1ca78 Merge "When returning, transition only existing shared elements." into mnc-dev 2015-05-04 21:48:56 +00:00
George Mount
8de1de1f04 When returning, transition only existing shared elements. 
Previously all shared element names were delivered when
returning from an Activity, even if no shared elements
existed in the exiting Activity. That prevented the calling
Activity from showing a shared element that it delivered,
but will not be receiving back again until shared elements
are transfered. That leaves a weird hole in the UI.

Now only the shared elements mapped in the returning view
hierarchy are delivered to the calling Activity.

Change-Id: I481a8bc7a771d7e819871f424d22313314c9ee8b
 2015-05-04 14:12:40 -07:00
P.Y. Laligand
5c7773d864 Display mode switches. 
Knowledge of the various modes of a display is now available to apps, and they can request a specific mode for their windows.

b/18241736

Change-Id: I8eb16ff713e878512faca3ca6662254f08a9be7f
 2015-05-04 13:30:58 -07:00
George Mount
61bab469a1 Merge "Fix Visibility not changing until Animator ends." into mnc-dev 2015-05-04 20:26:48 +00:00
Alan Viverette
d38d3574d0 Merge "Always force constructors accessible during inflation" into mnc-dev 2015-05-04 19:38:57 +00:00
Jeff Sharkey
5f809e3fff Merge "Avoid NPE when fsUuid is null." into mnc-dev 2015-05-04 19:06:39 +00:00
Jeff Sharkey
c840681dbd Avoid NPE when fsUuid is null. 
Bug: 20822962
Change-Id: I6340b70dba5a4f94a0f08ddfbda0190db97746f1
 2015-05-04 12:04:09 -07:00
George Mount
fcfe531e74 Fix Visibility not changing until Animator ends. 
Sometimes an animator will be interrupted before it starts
during a transition and the onAnimatorEnd will not be called.
In this case, we must set the final state in the onTransitionEnd.

Bug 20416564

Change-Id: I388895215ba2b1c500de3a5afcae8db1fea288f7
 2015-05-04 11:37:27 -07:00
Alan Viverette
904de2ec93 Always force constructors accessible during inflation 
We now correctly throw an IllegalAccessException for non-public accesses,
but we were relying on the old incorrect behavior during inflation. This
CL forces constructors to be accessible so that we emulate the old
behavior and don't crash.

Where we were already doing this, the CL moves the setAccessible() call
immediately after the getConstructor() call, since there's no point in
calling it multiple times.

Bug: 20810495
Change-Id: I63dfcb857e445f688080eea05e86ef22760ed49f
 2015-05-04 10:32:57 -07:00
Jose Lima
bf89104a3a am 57b75732: am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 
* commit '57b7573210750ead5c6a5d6a8ebd41d8e61636ec':
  Move ContentInfoExtender from Notification.java to a support library
 2015-05-04 16:57:44 +00:00
Jose Lima
57b7573210 am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 
* commit 'bb9045ea4056901f84ba4d01d3fd5065063c7e39':
  Move ContentInfoExtender from Notification.java to a support library
 2015-05-04 16:43:41 +00:00
Jose Lima
5551aca2b8 Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 2015-05-04 16:29:30 +00:00
John Reck
ecc00b8138 am 0b1c17bd: am 01b321de: am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev 
* commit '0b1c17bd314ab093e8455077b1740e30b6189c02':
  Remove Bitmap#getSkBitmap
 2015-05-04 14:53:48 +00:00
John Reck
a525bb6694 am dd447382: am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 
* commit 'dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5':
  Move AssetAtlas off of SkBitmap*
 2015-05-04 14:53:43 +00:00
Tor Norbye
831c7266b4 am 20ccf13f: am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev 
* commit '20ccf13fbc685b96a8b1d4a59452143bec4fd711':
  Add permission annotations on the AccountManager
 2015-05-04 14:53:39 +00:00
John Reck
0b1c17bd31 am 01b321de: am 05dc201f: Merge "Remove Bitmap#getSkBitmap" into mnc-dev 
* commit '01b321de0bd179a1366c5f344fa1b094571fd5f4':
  Remove Bitmap#getSkBitmap
 2015-05-04 14:47:13 +00:00
John Reck
dd447382cd am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 
* commit 'cc8418fc5e323c8f2fed3cd7eb035b1c06db4992':
  Move AssetAtlas off of SkBitmap*
 2015-05-04 14:47:07 +00:00
Tor Norbye
20ccf13fbc am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev 
* commit '7a560701fda09522c5da1212d5ad8e3d81780c7c':
  Add permission annotations on the AccountManager
 2015-05-04 14:42:21 +00:00
John Reck
05dc201ff6 Merge "Remove Bitmap#getSkBitmap" into mnc-dev 2015-05-04 14:34:52 +00:00
John Reck
1641c0cb0b Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 2015-05-04 14:34:39 +00:00
Tor Norbye
335f043bdb Merge "Add permission annotations on the AccountManager" into mnc-dev 2015-05-04 14:19:20 +00:00
Tor Norbye
80b530afdb Add permission annotations on the AccountManager 
Also add some @NonNull and @Nullable annotations.

Change-Id: Ia42b1af21ed14691b2268ea8b0f55d1b8b5ea2a3
 2015-05-04 06:29:55 -07:00