Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
189,923 Commits 3 Branches 0 Tags
475b19623f4e417f64da3db336b0d64492953785
Commit Graph

47257 Commits

Author SHA1 Message Date
Julia Reynolds
475b19623f am e7691daf: am 89f19371: am 6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev 
* commit 'e7691dafecf60906d3d6660c532917466e5c25d1':
  Allow device initializers to set a preferred setup activity.
 2015-04-28 15:14:32 +00:00
Benjamin Franz
5d15da47ca am 518c315a: am 94e3b0c5: am 0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev 
* commit '518c315a7593395b278b03208bad44b158810e6f':
  Introduce disable2 into StatusBarManager
 2015-04-28 15:14:26 +00:00
Julia Reynolds
e7691dafec am 89f19371: am 6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev 
* commit '89f193715484c5e10e555aa477012c0246a1827e':
  Allow device initializers to set a preferred setup activity.
 2015-04-28 14:50:11 +00:00
Benjamin Franz
518c315a75 am 94e3b0c5: am 0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev 
* commit '94e3b0c509aacd8ff0395c56f06a7898eabeca5b':
  Introduce disable2 into StatusBarManager
 2015-04-28 14:50:05 +00:00
Narayan Kamath
b40b49577c am 7ecc6b72: am 71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray" 
* commit '7ecc6b721e5da0cc3a52dc14bdfd8d1308db84bc':
  Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
 2015-04-28 10:00:25 +00:00
Narayan Kamath
498bf16ef0 am 90601a72: am b736868b: Merge "Fix NullPointerException in Bundle#hasFileDescriptors" 
* commit '90601a724efea2a15769195b4c452d854607931e':
  Fix NullPointerException in Bundle#hasFileDescriptors
 2015-04-28 10:00:15 +00:00
Narayan Kamath
7ecc6b721e am 71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray" 
* commit '71fa6862f307796c659fd4e83a7724dd6851b69e':
  Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
 2015-04-28 09:48:24 +00:00
Narayan Kamath
90601a724e am b736868b: Merge "Fix NullPointerException in Bundle#hasFileDescriptors" 
* commit 'b736868be917afd5d3ea7e8a8d3d658c4350a239':
  Fix NullPointerException in Bundle#hasFileDescriptors
 2015-04-28 09:48:19 +00:00
Taiju Tsuiki
ecd2184873 Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray 
Add a null check for each values of SparseArray in Bundle#hasFileDescriptor
to avoid NullPointerException.

Change-Id: I43ecc01f2759ccbe85b902fa118d55cb74ebf38b
 2015-04-28 09:30:19 +01:00
Taiju Tsuiki
e58c7858a3 Fix NullPointerException in Bundle#hasFileDescriptors 
Add null check for array elements in Bundle#hasFileDescriptors to avoid NPE on
null valued array.

Change-Id: Ic6ef8864ca6add023c7a69ba3c9474b0f6291723
 2015-04-28 09:27:40 +01:00
Tor Norbye
7b4b844fdf Merge "Annotate some APIs with threading annotations" 2015-04-27 22:51:35 +00:00
fenglu
ae519190aa Fix the javadoc for requestBandwidthUpdate(...) 
Change-Id: I6673dd219ef832acb15ce9b6398caa1c8503320b
 2015-04-27 14:28:04 -07:00
fenglu
d515d07336 Merge "API review for requestBandwidthUpdate()" 2015-04-27 20:34:01 +00:00
Andreas Gampe
a5b55a017a am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp 
* commit 'b6d14a009e43a4d61ae2a4f98f6e3b914148d0a9':
  Frameworks/base: Add debug.gencfi property
 2015-04-27 18:28:18 +00:00
Julia Reynolds
6ab47fc111 Merge "Allow device initializers to set a preferred setup activity." into mnc-dev 2015-04-27 17:29:23 +00:00
Andreas Gampe
b6d14a009e resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp 
Change-Id: I0e3dacbdfb68d6bb31800ff2e9969b96e63634b6
 2015-04-27 10:18:08 -07:00
Julia Reynolds
13c58bacc8 Allow device initializers to set a preferred setup activity. 
This activity will launch by default on device reboot or user switch
during user initialization, even if there are higher priority 'home'
activities.

Bug: 20223050
Change-Id: I335aeb010a1ae5db07a4343d26e160c74bd299e1
 2015-04-27 12:57:15 -04:00
Benjamin Franz
cde0a2a9ea Introduce disable2 into StatusBarManager 
We ran out of space for new disable flags, so need to introduce a
disable2 API into StatusBarManager and update all the underlying code
to support the second set of flags.

Bug: 20331928
Change-Id: I5009b393133c576b37d7e2bae0df97cb8c41a065
 2015-04-27 16:46:12 +00:00
Keisuke Kuroyanagi
f6a78de10f am 838a99e9: am bde00321: am 28b5b144: Fix: Selection handles are wrongly shown. 
* commit '838a99e9adcdd065582956cac5150483535da4ae':
  Fix: Selection handles are wrongly shown.
 2015-04-27 15:51:33 +00:00
Narayan Kamath
d283a7dd52 am b6d1d717: am cf6fc5ee: Merge "Fix incorrect javadoc for Uri.getQueryParameter." 
* commit 'b6d1d7171dff2d2625ae183e8629d627882fb493':
  Fix incorrect javadoc for Uri.getQueryParameter.
 2015-04-27 15:33:35 +00:00
Andreas Gampe
c29791d56a Merge "Frameworks/base: Add debug.gencfi property" 2015-04-27 15:06:48 +00:00
Keisuke Kuroyanagi
838a99e9ad am bde00321: am 28b5b144: Fix: Selection handles are wrongly shown. 
* commit 'bde0032125e9e8199502e38c81cf2d47d2c0811c':
  Fix: Selection handles are wrongly shown.
 2015-04-27 12:50:49 +00:00
Abodunrinwa Toki
0fe6ab7960 Merge "Update floatingtoolbar position when cursor moves." 2015-04-27 12:01:02 +00:00
Narayan Kamath
b6d1d7171d am cf6fc5ee: Merge "Fix incorrect javadoc for Uri.getQueryParameter." 
* commit 'cf6fc5ee13e549c6ce1a6a4fc417aa13fc0dfa17':
  Fix incorrect javadoc for Uri.getQueryParameter.
 2015-04-27 11:35:12 +00:00
Narayan Kamath
4356c95354 Fix incorrect javadoc for Uri.getQueryParameter. 
This first went out with Jelly Bean and not ICS.

bug: https://code.google.com/p/android/issues/detail?id=61651
Change-Id: I26f6b18593fe089bd3a52ec1d159494923bcbad1
 2015-04-27 10:42:41 +00:00
Keisuke Kuroyanagi
28b5b14449 Fix: Selection handles are wrongly shown. 
Selection handles were always shown when selection action
mode is started at first time. When the action mode is
started without a selection, only insertion handle must be
shown.

Bug: 20264980
Bug: 20407551

Change-Id: I630804e007f795d28f87e3fa6cba0de5bf588c78
 2015-04-27 09:48:26 +00:00
Andrei Stingaceanu
78214c90db Minor clean up: redundant functionality in Editor and TextView. 
This is a no-op.

Change-Id: I948ba8a5857fbbd58b656e6af0a8f590a00345d9
 2015-04-27 10:40:02 +01:00
Andreas Gampe
0f94fc6f1d Merge "Frameworks/base: Fix a constructor" 2015-04-25 20:16:12 +00:00
Aravind Akella
398e11837b Merge "Add hidden SensorManager APIs for injecting sensor data." 2015-04-25 01:40:26 +00:00
Etan Cohen
4e4fec1b8d Merge "Fix documentation - non-public API." 2015-04-25 01:08:11 +00:00
Etan Cohen
237a59767d Fix documentation - non-public API. 
Change-Id: I418bf47b197936b2f50b231425312d5b6d272df8
 2015-04-24 18:06:59 -07:00
Jeff Sharkey
49314cea50 Merge "Migrate primary external storage." 2015-04-25 01:03:08 +00:00
Jeff Sharkey
275e3e43f2 Migrate primary external storage. 
Wire up through MountService to call down into vold.  Watch for
unsolicited events that report progress, including special value "82"
that signals that copy has finished.  We use this value to persist
the volumeUuid in case of unexpected reboot, since it indicates the
new volume is ready.

Wire progress updates through existing callback pipeline.

Update the volume mounting code to match against the persisted UUID
when selecting the primary external storage.

Bug: 19993667
Change-Id: Id46957610fb43517bbfbc368f29b7d430664590d
 2015-04-24 18:01:45 -07:00
Etan Cohen
cd895cdf4d Merge changes from topic 'mwd-merge-042415' 
* changes:
  Rename removeVideoCallListener to unregisterCallback
  Bluetooth document fix: remove reference from open API to hidden entities
  Fix build due to merge of 7595842 and renaming due to 8eb87f0
  Merge commit '052a0da' into merge2
  Merge commit 'db1dbb8' into merge2
  Merge commit '7e5e791' into merge2
  Merge commit '170102d' into merge2
  Merge commit '4cb5d80' into merge2
  Merge commit '83cda00' into merge2
  Merge commit 'c91bc62' into merge2
  Merge commit 'cffc360' into merge2
  Merge commit '7f61051' into merge2
  Merge commit '167c3a7' into merge2
  Merge commit '4467b98' into merge2
  Merge commit '25a217c' into merge2
  Merge commit '04b18ec' into merge2
  Merge commit '7595842' into merge2
  Merge commit '2bbd2b6' into merge2
  Merge commit '4890351' into merge2
  Merge commit 'cd405fe' into merge2
  Merge commit '6ddbb5e' into merge2
  Merge commit 'de93575' into merge2
  Merge commit '9561e74' into merge2
 2015-04-25 00:51:47 +00:00
Ruben Brunk
998ee16570 Merge "camera: Start/stop preview before clearing surface." 2015-04-25 00:48:26 +00:00
Adam Cohen
daa58a4008 Merge "Remove problematic early return from notifyDataSetChanged" 2015-04-24 23:43:57 +00:00
Amith Yamasani
bf02d48f4a Merge "More usage tracking" 2015-04-24 23:39:37 +00:00
Andreas Gampe
a876b35d48 Frameworks/base: Add debug.gencfi property 
Add the debug.gencfi system property that forces generation of
CFI data.

Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
 2015-04-24 16:31:41 -07:00
Adam Cohen
005f7cf13e Remove problematic early return from notifyDataSetChanged 
-> If connection to the service fails for whatever reason,
mNotifyDataSetChangedAfterOnServiceConnected can get stuck to true, preventing
future connections to the service. Don't let this prevent from connecting to the
service.

issue 19890339

Change-Id: I376101ae146359109df53add3a3202ba2e1e842d
 2015-04-24 16:23:42 -07:00
Amith Yamasani
f47e51ec60 More usage tracking 
Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.

Bug: 20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40
 2015-04-24 16:12:01 -07:00
Abodunrinwa Toki
6e5c51b744 Update floatingtoolbar position when cursor moves. 
NOTE: This is only done on ACTION_UP event since the toolbar is
going to be hidden while one is dragging the handles.

Change-Id: Id09fc076edb0117ebceb26395ac91ee4d2283c2d
 2015-04-25 00:11:25 +01:00
Doris Liu
d34f44028d Merge "Remove distance based animation duration API" 2015-04-24 23:05:01 +00:00
Seigo Nonaka
9a1cf497e5 Merge "Notify IME visibility when showWindow is called." 2015-04-24 22:46:14 +00:00
Jens Ole Lauridsen
0525677343 Merge "parcel: Add efficient methods for writing and reading a parcelable." 2015-04-24 22:37:46 +00:00
Wale Ogunwale
584e513952 am cc9c597d: am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'cc9c597dad6d99242ed2903d8760922f66223401':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:35:34 +00:00
Wale Ogunwale
169364c1e5 am 4cdc7e84: am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit '4cdc7e842d8b1ff1e70d2a0b4a2a1939fa116563':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:35:26 +00:00
Wale Ogunwale
cc9c597dad am d639a453: am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'd639a4532417bf605f03b3b5efdb3a9e1cbe6661':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:26:08 +00:00
Wale Ogunwale
4cdc7e842d am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:26:04 +00:00
Wale Ogunwale
d639a45324 am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:15:02 +00:00
Wale Ogunwale
e2047da6f3 am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 
* commit 'd9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
  Revert "Clean-up state if we have an exception when acquiring provider"
 2015-04-24 22:14:56 +00:00