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

198278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
14c09fa3c5 Camera2: Add hidden experimental tearDown method 
Bug: 18949148
Change-Id: I6264d95a26ebf51cce6114c9a86b9561f7c60ab5
 2015-07-16 14:55:26 -07:00
Dianne Hackborn
9236af43d8 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 21:51:49 +00:00
Filip Gruszczynski
550f1d4eb3 Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev 2015-07-16 21:47:29 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Makoto Onuki
89bcc24b0f am d737ab17: am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 
* commit 'd737ab1776d1bb7a3402137bdbf3afffe9860c5a':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS
 2015-07-16 21:30:39 +00:00
Makoto Onuki
d737ab1776 am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 
* commit 'b09b84cafde5ac31f5ef5c79f7a78db540824471':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS
 2015-07-16 21:19:33 +00:00
Tingting Wang
86ac228143 Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1." 
This reverts commit d55b348e629d5ae5a2efbba6735be4b30220e50b.

Change-Id: I3e623de725c419489294aed6c3b3aea838fc0f7b
 2015-07-16 21:19:28 +00:00
Makoto Onuki
b09b84cafd Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 2015-07-16 21:01:39 +00:00
Chris Craik
8ce8f3f4d6 Fix clip area behavior for REPLACE op 
bug:22291400

Work around clippath-clipped-to-view-bounds behavior by
implementing REPLACE op fast path, avoiding the transition to
SkRegion/SkPath.

Change-Id: I63c1cf961db2d6e3759d83914de1036c9ac7497a
 2015-07-16 13:31:41 -07:00
Svet Ganov
e7b7049b95 am f8847c02: am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'f8847c02dce2c8ca66d29f8debf120c275b41f09':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 19:42:29 +00:00
Robert Schaub
57cea81f6b am 70ab6b79: am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 
* commit '70ab6b79147db0894b242cdb597ea5ec9e2d7dac':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
 2015-07-16 19:27:24 +00:00
Svet Ganov
f8847c02dc am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 
* commit 'db8fa48ed0864125a07f2bbe078fd60abd875ac7':
  Return a result from Fragment#shouldShowRequestPermissionRationale
 2015-07-16 19:27:18 +00:00
Svet Ganov
db8fa48ed0 Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev 2015-07-16 19:16:59 +00:00
Robert Schaub
70ab6b7914 am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 
* commit '081649c2b5ffc1d9ea7a389cc9687659544a535e':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
 2015-07-16 19:10:48 +00:00
Dianne Hackborn
786946db0b am 9e55d57d: am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev 
* commit '9e55d57dc7fccbeae4bb8ff4be322d7e2b87dacc':
  Don't spam the system with unique wake lock names.
 2015-07-16 19:04:26 +00:00
Robert Schaub
081649c2b5 am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 
* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
 2015-07-16 18:57:39 +00:00
Dianne Hackborn
9e55d57dc7 am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev 
* commit '8983420d30d3e962c519d7f9a5d8b8ea4bc3f42c':
  Don't spam the system with unique wake lock names.
 2015-07-16 18:45:37 +00:00
Julia Reynolds
c11d838bc5 Support 24 clock displays in demo mode. 
Bug: 22388468
Change-Id: I0a9f1c214a1612dbc225386ae8777a1480dd14b0
 2015-07-16 14:40:37 -04:00
Robert Schaub
f4db2de881 am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 
* commit '1b29a95789c29174d5e4d526f6449c2c354ef3b3':
  docs: Added "location" before "gps" in list under "Declaring hardware ..."
 2015-07-16 18:40:37 +00:00
Makoto Onuki
bc92479a29 DefaultPermission: GET_ACCOUNTS is now in CONTACTS 
Bug 22532312

Change-Id: If7ad0faa3a196bb28da1ddc13788c0430df1d1ee
 2015-07-16 11:38:00 -07:00
Dianne Hackborn
8983420d30 Merge "Don't spam the system with unique wake lock names." into mnc-dev 2015-07-16 18:31:19 +00:00
Todd Kennedy
a6a5ba1927 am c84bf849: am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev 
* commit 'c84bf8498e51b04f8be5bfea0616a4bc0bc81eee':
  Verfiy global apps with device owner
 2015-07-16 18:21:54 +00:00
Robert Schaub
1b29a95789 Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs 2015-07-16 18:21:22 +00:00
Todd Kennedy
c84bf8498e am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev 
* commit 'a4911ed97102b638a373adcdae7e4c9b3c64cc30':
  Verfiy global apps with device owner
 2015-07-16 18:09:51 +00:00
Todd Kennedy
a4911ed971 Merge "Verfiy global apps with device owner" into mnc-dev 2015-07-16 17:59:35 +00:00
Dianne Hackborn
a7cfbe0e54 Work on issue #22516282: ChooserTarget URI grants not forwarded 
Add new option to startActivityAsCaller() which allows you to
specify that we should not do security checks on the target
activity being launched.

Change-Id: Ie6b28807b96fef35ccdff93b0a01066cfd8fa307
 2015-07-16 10:52:52 -07:00
Wale Ogunwale
40d16bd07c am fd2a5f14: am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev 
* commit 'fd2a5f14859c8ed78ccb0b2138cb7e6cb3a908c3':
  Animate app exit for cases where the app is already hidden before transition
 2015-07-16 17:30:42 +00:00
Wale Ogunwale
fd2a5f1485 am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev 
* commit '1181323230478e3027bbabbbaf769dcd4a11a0e4':
  Animate app exit for cases where the app is already hidden before transition
 2015-07-16 17:16:10 +00:00
John Reck
b4d49a4d39 am d5612d06: am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit 'd5612d06c46e0a3e2d1b55cc4288ea6759b96a94':
  Don't crash on makeCurrent fail
 2015-07-16 17:16:01 +00:00
John Reck
d5612d06c4 am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit 'ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
  Don't crash on makeCurrent fail
 2015-07-16 17:01:22 +00:00
Wale Ogunwale
1181323230 Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev 2015-07-16 17:01:15 +00:00
Alex Klyubin
c58153b2d7 HMAC keys are authorized for exactly one digest. 
This is in preparation for enforcing the minimum length of MACs
which in the case of HMAC keys generated or imported by Android
Keystore will be set to the length of the digest for which the
key is authorized.

Bug: 22337277
Change-Id: I0255d5ba184dabfb6b45d8f32ddadeb84ab7fc19
 2015-07-16 09:59:51 -07:00
Svet Ganov
9e136b88ba Return a result from Fragment#shouldShowRequestPermissionRationale 
bug:22523342

Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
 2015-07-16 09:58:43 -07:00
John Reck
ba4f075777 Merge "Don't crash on makeCurrent fail" into mnc-dev 2015-07-16 16:50:30 +00:00
Wale Ogunwale
b60c0f616c Animate app exit for cases where the app is already hidden before transition 
It is possible for an app token to be marked as hidden and exiting
because the previous activity destory is completed before we are
good-to-go with app transition since we are still waiting for the
opening app to be done drawing. In this case we don't apply the
exiting animation since the token is not changing visibility state
during the app transition (it is already hidden and we are telling
it to hide...).
We now allow the animation to load if the token is already hidden
and marked as exiting.

Bug: 22381703
Change-Id: I5c27b6c3c1f810f05b2d716122055c6f12d0a167
 2015-07-16 09:45:35 -07:00
Todd Kennedy
633f199831 Verfiy global apps with device owner 
Applications installed for a specific user must be verfied as that user. However,
apps that are installed globally [i.e. UserHandle.ALL] should not be verified by
every user on the device. Instead, they should be verified by the device owner.

Bug: 21901423
Change-Id: I5fd3f690d08e7e911a3c86f09bbfcd4eb635b418
 2015-07-16 09:44:31 -07:00
John Reck
f2dcc2aecb Don't crash on makeCurrent fail 
Bug: 22444755

WindowManager may decide to yank the surface at any point, so
attempt to kinda handle this

Change-Id: Id2f665d2f0f93bccd4ec977fbf52dca4dc1ec891
 2015-07-16 09:17:59 -07:00
Tony Mak
5eea245598 am 245466b5: am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 
* commit '245466b5734546264b0492455fd2f6dc135daf39':
  Fix calendar reminder notification is not shown in idle state
 2015-07-16 15:15:32 +00:00
Tony Mak
245466b573 am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 
* commit '532737df65330200dc55ae42d31140d19c4024be':
  Fix calendar reminder notification is not shown in idle state
 2015-07-16 15:03:56 +00:00
Tony Mak
532737df65 Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev 2015-07-16 14:50:19 +00:00
George Mount
aa476de575 am 2456f77c: am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 
* commit '2456f77c3f3ab001ac20cd7d8ee099c14f98271f':
  Make additional shared elements a version-checked feature.
 2015-07-16 14:42:29 +00:00
George Mount
bf6430a0f3 am 3d520403: am 30c8245a: Merge "Add data binding to built javadoc." into mnc-dev 
* commit '3d52040359721934231e0e89d45b3bd4179db475':
  Add data binding to built javadoc.
 2015-07-16 14:42:25 +00:00
George Mount
2456f77c3f am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 
* commit 'bd87b6b5b0c478c45d0dd5725cbc59995e751c64':
  Make additional shared elements a version-checked feature.
 2015-07-16 14:29:42 +00:00
George Mount
3d52040359 am 30c8245a: Merge "Add data binding to built javadoc." into mnc-dev 
* commit '30c8245afc8d9558b76e5c86f917c22e02f6e820':
  Add data binding to built javadoc.
 2015-07-16 14:29:38 +00:00
George Mount
bd87b6b5b0 Merge "Make additional shared elements a version-checked feature." into mnc-dev 2015-07-16 14:24:09 +00:00
George Mount
30c8245afc Merge "Add data binding to built javadoc." into mnc-dev 2015-07-16 14:19:12 +00:00
George Mount
2c256a04ae Make additional shared elements a version-checked feature. 
Bug 22505481

ag/684544 added a feature to allow shared elements that weren't
shared into an Activity to be shared back. However, if you are
targeting an older version of the SDK, you may get an unexpected
shared element back. This change in behavior has been locked
behind a target version check.

Change-Id: I7162e24f3b14fedd6b308e89e9d04ac67660f7d6
 2015-07-16 07:09:42 -07:00
Nicolas Prevot
e40369476d am b298ba48: am dbdf7c45: Don\'t send app links to the parent if status = never (part 2) 
* commit 'b298ba48275fb36390398afbe196cc1ef7dae762':
  Don't send app links to the parent if status = never (part 2)
 2015-07-16 11:21:32 +00:00
Nicolas Prevot
b298ba4827 am dbdf7c45: Don\'t send app links to the parent if status = never (part 2) 
* commit 'dbdf7c45380f7701e029a279932d2c97bf55fdc9':
  Don't send app links to the parent if status = never (part 2)
 2015-07-16 11:12:30 +00:00
Nicolas Prevot
dbdf7c4538 Don't send app links to the parent if status = never (part 2) 
To qualify for cross-profile app linking, an intent should resolve
with a better status than "NEVER". Moved this check from canForwardTo
into the source method, getCrossProfileDomainPreferredLpr, to stop
bad resolutions leaking out.

BUG:22287521
Change-Id: I195979d78a783864d841a81f358780912bbf168e
 2015-07-16 10:13:00 +01:00